diff --git a/apps/int-demo/src/main/java/org/onosproject/intdemo/IntDemoApp.java b/apps/int-demo/src/main/java/org/onosproject/intdemo/IntDemoApp.java
index a93c414..d796d79 100644
--- a/apps/int-demo/src/main/java/org/onosproject/intdemo/IntDemoApp.java
+++ b/apps/int-demo/src/main/java/org/onosproject/intdemo/IntDemoApp.java
@@ -278,7 +278,7 @@
             return;
         }
 
-        confIntSwitch(deviceId);
+        // confIntSwitch(deviceId);
 
         if (deviceId.toString().contains(SPGW_DEVICE_KEYWORD)) {
             confSpgw(deviceId);
diff --git a/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java b/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
index c817078..7e00c16 100644
--- a/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
+++ b/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
@@ -56,11 +56,12 @@
 
     private static final String PLAIN_FABRIC = "";
     private static final String WITH_SPGW = "-spgw";
-    private static final String WITH_SPGW_INT = "-spgw-int";
+    private static final String WITH_SPGW_INT_1 = "-spgw-int-1";
+    private static final String WITH_SPGW_INT_2 = "-spgw-int-2";
 
     // TODO: add WITH_SPGW when ready
     private static final Collection<String> APPENDICES = ImmutableList
-            .of(PLAIN_FABRIC, WITH_SPGW, WITH_SPGW_INT);
+            .of(PLAIN_FABRIC, WITH_SPGW, WITH_SPGW_INT_1, WITH_SPGW_INT_2);
 
     private static final Collection<String> PLATFORMS = ImmutableList
             .of(MAVERICKS, MONTARA);
diff --git a/pipelines/fabric-pro/src/main/resources/Makefile b/pipelines/fabric-pro/src/main/resources/Makefile
index 04dfa2c..76323c2 100644
--- a/pipelines/fabric-pro/src/main/resources/Makefile
+++ b/pipelines/fabric-pro/src/main/resources/Makefile
@@ -33,17 +33,39 @@
 		--p4runtime-file p4c-out/tofino/fabric-spgw/montara/fabric.p4info \
 		--p4runtime-format text main.p4
 
-fabric-spgw-int-tofino:
+fabric-spgw-int-tofino: fabric-spgw-int-1-tofino fabric-spgw-int-2-tofino
+
+fabric-spgw-int-1-tofino:
 	p4c -x p4-16 -b tofino-v1model-barefoot \
 		-I $(P4_SRC_DIR) \
-		$(MAVERICKS_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -o p4c-out/tofino/fabric-spgw-int/mavericks \
-		--p4runtime-file p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info \
+		$(MAVERICKS_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -DINT_SWITCH_ID=100 -o p4c-out/tofino/fabric-spgw-int-1/mavericks \
+		--p4runtime-file p4c-out/tofino/fabric-spgw-int-1/mavericks/fabric.p4info \
 		--p4runtime-format text main.p4
 	p4c -x p4-16 -b tofino-v1model-barefoot \
 		-I $(P4_SRC_DIR) \
-		$(MONTARA_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -o p4c-out/tofino/fabric-spgw-int/montara \
-		--p4runtime-file p4c-out/tofino/fabric-spgw-int/montara/fabric.p4info \
+		$(MONTARA_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -DINT_SWITCH_ID=100 -o p4c-out/tofino/fabric-spgw-int-1/montara \
+		--p4runtime-file p4c-out/tofino/fabric-spgw-int-1/montara/fabric.p4info \
 		--p4runtime-format text main.p4
+	sed -i 's/FabricIngress\.//g' p4c-out/tofino/fabric-spgw-int-1/*/*.p4info
+	sed -i 's/FabricEgress\.//g' p4c-out/tofino/fabric-spgw-int-1/*/*.p4info
+	sed -i 's/FabricIngress\.//g' p4c-out/tofino/fabric-spgw-int-1/*/context.json
+	sed -i 's/FabricEgress\.//g' p4c-out/tofino/fabric-spgw-int-1/*/context.json
+
+fabric-spgw-int-2-tofino:
+	p4c -x p4-16 -b tofino-v1model-barefoot \
+		-I $(P4_SRC_DIR) \
+		$(MAVERICKS_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -DINT_SWITCH_ID=200 -o p4c-out/tofino/fabric-spgw-int-2/mavericks \
+		--p4runtime-file p4c-out/tofino/fabric-spgw-int-2/mavericks/fabric.p4info \
+		--p4runtime-format text main.p4
+	p4c -x p4-16 -b tofino-v1model-barefoot \
+		-I $(P4_SRC_DIR) \
+		$(MONTARA_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -DINT_SWITCH_ID=200 -o p4c-out/tofino/fabric-spgw-int-2/montara \
+		--p4runtime-file p4c-out/tofino/fabric-spgw-int-2/montara/fabric.p4info \
+		--p4runtime-format text main.p4
+	sed -i 's/FabricIngress\.//g' p4c-out/tofino/fabric-spgw-int-2/*/*.p4info
+	sed -i 's/FabricEgress\.//g' p4c-out/tofino/fabric-spgw-int-2/*/*.p4info
+	sed -i 's/FabricIngress\.//g' p4c-out/tofino/fabric-spgw-int-2/*/context.json
+	sed -i 's/FabricEgress\.//g' p4c-out/tofino/fabric-spgw-int-2/*/context.json
 
 fabric-int-tofino:
 	p4c -x p4-16 -b tofino-v1model-barefoot \
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/context.json
old mode 100644
new mode 100755
similarity index 90%
rename from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/context.json
index a1aaebd..8f5b945
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/context.json
@@ -1,5 +1,5 @@
 {
-  "build_date": "03/23/18 21:19:12",
+  "build_date": "03/24/18 19:14:19",
   "schema_version": "1.3.3",
   "compiler_version": "6.0.0-alpha.7",
   "program_name": "main",
@@ -14,7 +14,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32,7 +32,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -50,7 +50,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -68,7 +68,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -86,7 +86,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -104,7 +104,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -122,6 +122,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -147,11 +212,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -162,7 +227,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -173,7 +238,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -184,7 +249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -198,99 +263,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -300,8 +278,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -318,7 +296,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -332,11 +397,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -347,7 +412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -358,7 +423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -369,7 +434,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -383,7 +448,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -401,7 +466,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -419,29 +484,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -455,29 +502,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -495,7 +524,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -513,7 +542,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -531,7 +560,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -549,7 +578,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -616,7 +645,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -635,7 +664,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -654,7 +683,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -673,7 +702,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -718,7 +747,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -737,7 +766,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -756,7 +785,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -775,7 +804,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -820,7 +849,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -839,7 +868,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -858,7 +887,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -877,7 +906,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -891,7 +920,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -909,7 +938,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -927,61 +956,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -992,7 +967,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1003,7 +978,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1014,7 +989,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1028,11 +1003,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1043,7 +1018,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1054,7 +1029,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1065,7 +1040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1079,11 +1054,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1094,7 +1069,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1108,11 +1083,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1123,7 +1098,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1137,12 +1112,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -1159,24 +1188,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -1188,7 +1199,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1210,7 +1221,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1232,7 +1243,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1243,7 +1254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1257,7 +1268,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -1275,7 +1286,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -1290,7 +1301,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1301,7 +1312,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1315,11 +1326,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1330,7 +1341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1344,11 +1355,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1362,6 +1391,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -1399,7 +1446,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1410,7 +1457,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1421,7 +1468,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1432,7 +1479,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1443,7 +1490,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1454,7 +1501,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1465,7 +1512,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1476,7 +1523,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1516,7 +1563,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1527,7 +1574,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1538,7 +1585,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1549,7 +1596,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1560,7 +1607,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1571,7 +1618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1582,7 +1629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1593,7 +1640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1604,7 +1651,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1615,7 +1662,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1626,7 +1673,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1637,7 +1684,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1648,7 +1695,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1659,7 +1706,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1670,7 +1717,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1688,7 +1735,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1699,7 +1746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1710,7 +1757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1721,7 +1768,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1732,7 +1779,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1743,7 +1790,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1754,7 +1801,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1765,7 +1812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1783,7 +1830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1794,7 +1841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1805,7 +1852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1816,7 +1863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1827,7 +1874,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1838,7 +1885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1849,7 +1896,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -1867,7 +1914,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1885,7 +1932,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1914,7 +1961,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -1950,7 +1997,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1961,7 +2008,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1979,7 +2026,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -2026,17 +2073,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -2046,7 +2082,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2064,8 +2100,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -2082,6 +2118,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -2096,11 +2168,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2114,7 +2186,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -2132,11 +2204,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2150,7 +2222,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -2168,29 +2240,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2204,11 +2258,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2222,7 +2276,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -2273,7 +2327,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -2302,94 +2356,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2407,7 +2378,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2425,7 +2396,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2443,7 +2414,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2461,7 +2432,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2479,23 +2450,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -2508,8 +2468,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -2526,25 +2486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2558,40 +2500,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2605,11 +2518,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2623,7 +2536,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -2746,41 +2659,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -2798,7 +2685,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -2810,6 +2723,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -2817,8 +2749,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -2836,8 +2768,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -2855,8 +2787,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -2875,7 +2807,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -2894,7 +2826,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -2912,8 +2844,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -2922,7 +2854,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -2931,25 +2863,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -2957,26 +2870,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -2988,51 +2882,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -3040,8 +2889,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -3059,8 +2908,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -3073,133 +2922,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -3214,25 +2936,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -3250,7 +2954,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -3268,7 +3099,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -3286,11 +3117,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3304,11 +3135,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3322,7 +3153,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -3340,11 +3171,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3355,7 +3186,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3369,11 +3200,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3387,7 +3218,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -3471,7 +3302,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -3522,7 +3353,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -3540,7 +3371,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -3558,7 +3389,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -3576,11 +3407,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -3598,7 +3429,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3609,7 +3440,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3620,7 +3451,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3631,7 +3462,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3682,7 +3513,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3693,7 +3524,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3704,7 +3535,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3715,7 +3546,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3755,7 +3586,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3766,7 +3597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3777,7 +3608,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3788,7 +3619,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3835,7 +3666,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3846,7 +3677,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3886,7 +3717,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3897,7 +3728,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3951,7 +3782,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3969,7 +3800,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3987,7 +3818,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4016,7 +3847,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4045,7 +3876,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4056,7 +3887,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4074,23 +3905,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -4103,10 +3934,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -4114,10 +3945,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -4132,7 +3981,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4143,7 +4043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4154,7 +4054,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4165,7 +4065,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4176,7 +4076,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4187,7 +4087,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4223,7 +4123,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -4241,74 +4141,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -4325,7 +4163,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4334,6 +4172,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -4348,7 +4241,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4366,7 +4259,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4384,7 +4277,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4402,7 +4295,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4420,7 +4313,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4438,7 +4331,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4456,6 +4349,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -4481,11 +4439,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4496,7 +4454,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4507,7 +4465,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4518,7 +4476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4532,99 +4490,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -4634,8 +4505,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -4652,7 +4523,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4666,11 +4624,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4681,7 +4639,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4692,7 +4650,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4703,7 +4661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4717,7 +4675,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -4735,7 +4693,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -4753,29 +4711,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4789,29 +4729,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4829,7 +4751,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4847,7 +4769,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4865,7 +4787,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4883,7 +4805,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4950,7 +4872,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -4969,7 +4891,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -4988,7 +4910,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -5007,7 +4929,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -5052,7 +4974,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -5071,7 +4993,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -5090,7 +5012,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -5109,7 +5031,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -5154,7 +5076,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -5173,7 +5095,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -5192,7 +5114,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -5211,7 +5133,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -5225,7 +5147,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5243,7 +5165,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5261,61 +5183,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5326,7 +5194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5337,7 +5205,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5348,7 +5216,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5362,11 +5230,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5377,7 +5245,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5388,7 +5256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5399,7 +5267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5413,11 +5281,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5428,7 +5296,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5442,11 +5310,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5457,7 +5325,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5471,12 +5339,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -5493,24 +5415,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -5522,7 +5426,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5544,7 +5448,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5566,7 +5470,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5577,7 +5481,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5591,7 +5495,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -5609,7 +5513,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -5624,7 +5528,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5635,7 +5539,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5649,11 +5553,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5664,7 +5568,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5678,11 +5582,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5696,6 +5618,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -5733,7 +5673,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5744,7 +5684,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5755,7 +5695,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5766,7 +5706,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5777,7 +5717,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5788,7 +5728,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5799,7 +5739,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5810,7 +5750,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5850,7 +5790,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5861,7 +5801,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5872,7 +5812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5883,7 +5823,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5894,7 +5834,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5905,7 +5845,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5916,7 +5856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5927,7 +5867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5938,7 +5878,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5949,7 +5889,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5960,7 +5900,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5971,7 +5911,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5982,7 +5922,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5993,7 +5933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6004,7 +5944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6022,7 +5962,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6033,7 +5973,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6044,7 +5984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6055,7 +5995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6066,7 +6006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6077,7 +6017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6088,7 +6028,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6099,7 +6039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6117,7 +6057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6128,7 +6068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6139,7 +6079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6150,7 +6090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6161,7 +6101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6172,7 +6112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6183,7 +6123,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -6201,7 +6141,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6219,7 +6159,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6248,7 +6188,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6284,7 +6224,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6295,7 +6235,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6313,7 +6253,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -6360,17 +6300,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -6380,7 +6309,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6398,8 +6327,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -6416,6 +6345,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -6430,11 +6395,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6448,7 +6413,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -6466,11 +6431,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6484,7 +6449,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -6502,29 +6467,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6538,11 +6485,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6556,7 +6503,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -6607,7 +6554,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -6636,94 +6583,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6741,7 +6605,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6759,7 +6623,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6777,7 +6641,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6795,7 +6659,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6813,23 +6677,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -6842,8 +6695,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -6860,25 +6713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6892,40 +6727,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6939,11 +6745,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6957,7 +6763,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -7080,41 +6886,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -7132,7 +6912,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -7144,6 +6950,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -7151,8 +6976,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -7170,8 +6995,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -7189,8 +7014,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -7209,7 +7034,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -7228,7 +7053,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -7246,8 +7071,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -7256,7 +7081,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -7265,25 +7090,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -7291,26 +7097,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -7322,51 +7109,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -7374,8 +7116,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -7393,8 +7135,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -7407,133 +7149,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -7548,25 +7163,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -7584,7 +7181,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -7602,7 +7326,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -7620,11 +7344,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7638,11 +7362,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7656,7 +7380,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -7674,11 +7398,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7689,7 +7413,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7703,11 +7427,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7721,7 +7445,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -7805,7 +7529,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -7856,7 +7580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -7874,7 +7598,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -7892,7 +7616,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -7910,11 +7634,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -7932,7 +7656,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7943,7 +7667,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7954,7 +7678,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7965,7 +7689,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8016,7 +7740,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8027,7 +7751,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8038,7 +7762,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8049,7 +7773,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8089,7 +7813,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8100,7 +7824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8111,7 +7835,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8122,7 +7846,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8169,7 +7893,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8180,7 +7904,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8220,7 +7944,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8231,7 +7955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8285,7 +8009,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8303,7 +8027,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8321,7 +8045,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8350,7 +8074,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8379,7 +8103,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8390,7 +8114,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8408,23 +8132,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -8437,10 +8161,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -8448,10 +8172,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -8466,7 +8208,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8477,7 +8270,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8488,7 +8281,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8499,7 +8292,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8510,7 +8303,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8521,7 +8314,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8557,7 +8350,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -8575,74 +8368,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -8659,7 +8390,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8668,6 +8399,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -8682,7 +8468,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8700,7 +8486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8718,7 +8504,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8736,7 +8522,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8754,7 +8540,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8772,7 +8558,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8790,6 +8576,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -8815,11 +8666,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8830,7 +8681,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8841,7 +8692,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8852,7 +8703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8866,99 +8717,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -8968,8 +8732,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -8986,7 +8750,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9000,11 +8851,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9015,7 +8866,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9026,7 +8877,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9037,7 +8888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9051,7 +8902,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -9069,7 +8920,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -9087,29 +8938,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9123,29 +8956,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9163,7 +8978,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9181,7 +8996,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9199,7 +9014,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9217,7 +9032,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9284,7 +9099,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -9303,7 +9118,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -9322,7 +9137,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -9341,7 +9156,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -9386,7 +9201,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -9405,7 +9220,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -9424,7 +9239,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -9443,7 +9258,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -9488,7 +9303,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -9507,7 +9322,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -9526,7 +9341,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -9545,7 +9360,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -9559,7 +9374,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9577,7 +9392,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9595,61 +9410,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9660,7 +9421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9671,7 +9432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9682,7 +9443,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9696,11 +9457,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9711,7 +9472,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9722,7 +9483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9733,7 +9494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9747,11 +9508,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9762,7 +9523,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9776,11 +9537,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9791,7 +9552,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9805,12 +9566,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -9827,24 +9642,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -9856,7 +9653,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9878,7 +9675,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9900,7 +9697,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9911,7 +9708,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9925,7 +9722,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -9943,7 +9740,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -9958,7 +9755,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9969,7 +9766,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9983,11 +9780,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9998,7 +9795,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10012,11 +9809,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10030,6 +9845,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -10067,7 +9900,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10078,7 +9911,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10089,7 +9922,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10100,7 +9933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10111,7 +9944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10122,7 +9955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10133,7 +9966,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10144,7 +9977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10184,7 +10017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10195,7 +10028,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10206,7 +10039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10217,7 +10050,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10228,7 +10061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10239,7 +10072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10250,7 +10083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10261,7 +10094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10272,7 +10105,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10283,7 +10116,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10294,7 +10127,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10305,7 +10138,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10316,7 +10149,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10327,7 +10160,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10338,7 +10171,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10356,7 +10189,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10367,7 +10200,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10378,7 +10211,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10389,7 +10222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10400,7 +10233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10411,7 +10244,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10422,7 +10255,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10433,7 +10266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10451,7 +10284,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10462,7 +10295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10473,7 +10306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10484,7 +10317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10495,7 +10328,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10506,7 +10339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10517,7 +10350,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -10535,7 +10368,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10553,7 +10386,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10582,7 +10415,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -10618,7 +10451,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10629,7 +10462,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10647,7 +10480,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -10694,17 +10527,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -10714,7 +10536,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10732,8 +10554,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -10750,6 +10572,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -10764,11 +10622,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10782,7 +10640,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -10800,11 +10658,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10818,7 +10676,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -10836,29 +10694,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10872,11 +10712,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10890,7 +10730,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -10941,7 +10781,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -10970,94 +10810,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11075,7 +10832,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11093,7 +10850,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11111,7 +10868,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11129,7 +10886,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11147,23 +10904,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -11176,8 +10922,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -11194,25 +10940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11226,40 +10954,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11273,11 +10972,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11291,7 +10990,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -11414,41 +11113,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -11466,7 +11139,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -11478,6 +11177,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -11485,8 +11203,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -11504,8 +11222,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -11523,8 +11241,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -11543,7 +11261,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -11562,7 +11280,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -11580,8 +11298,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -11590,7 +11308,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -11599,25 +11317,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -11625,26 +11324,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -11656,51 +11336,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -11708,8 +11343,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -11727,8 +11362,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -11741,133 +11376,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -11882,25 +11390,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -11918,7 +11408,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -11936,7 +11553,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -11954,11 +11571,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11972,11 +11589,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11990,7 +11607,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -12008,11 +11625,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12023,7 +11640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12037,11 +11654,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12055,7 +11672,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -12139,7 +11756,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -12190,7 +11807,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -12208,7 +11825,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -12226,7 +11843,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -12244,11 +11861,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -12266,7 +11883,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12277,7 +11894,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12288,7 +11905,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12299,7 +11916,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12350,7 +11967,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12361,7 +11978,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12372,7 +11989,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12383,7 +12000,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12423,7 +12040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12434,7 +12051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12445,7 +12062,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12456,7 +12073,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12503,7 +12120,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12514,7 +12131,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12554,7 +12171,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12565,7 +12182,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12619,7 +12236,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12637,7 +12254,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12655,7 +12272,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12684,7 +12301,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12713,7 +12330,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -12724,7 +12341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -12742,23 +12359,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -12771,10 +12388,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -12782,10 +12399,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -12800,7 +12435,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12811,7 +12497,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12822,7 +12508,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12833,7 +12519,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12844,7 +12530,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12855,7 +12541,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12891,7 +12577,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -12909,74 +12595,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -12993,7 +12617,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13002,6 +12626,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -13016,7 +12695,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13034,7 +12713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13052,7 +12731,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13070,7 +12749,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13088,7 +12767,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13106,7 +12785,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13124,6 +12803,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -13149,11 +12893,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13164,7 +12908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13175,7 +12919,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13186,7 +12930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13200,99 +12944,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -13302,8 +12959,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -13320,7 +12977,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13334,11 +13078,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13349,7 +13093,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13360,7 +13104,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13371,7 +13115,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13385,7 +13129,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -13403,7 +13147,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -13421,29 +13165,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13457,29 +13183,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13497,7 +13205,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13515,7 +13223,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13533,7 +13241,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13551,7 +13259,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13618,7 +13326,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -13637,7 +13345,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -13656,7 +13364,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -13675,7 +13383,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -13720,7 +13428,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -13739,7 +13447,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -13758,7 +13466,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -13777,7 +13485,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -13822,7 +13530,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -13841,7 +13549,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -13860,7 +13568,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -13879,7 +13587,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -13893,7 +13601,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13911,7 +13619,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13929,61 +13637,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13994,7 +13648,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14005,7 +13659,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14016,7 +13670,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14030,11 +13684,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14045,7 +13699,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14056,7 +13710,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14067,7 +13721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14081,11 +13735,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14096,7 +13750,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14110,11 +13764,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14125,7 +13779,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14139,12 +13793,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -14161,24 +13869,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -14190,7 +13880,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14212,7 +13902,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14234,7 +13924,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14245,7 +13935,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14259,7 +13949,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -14277,7 +13967,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -14292,7 +13982,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14303,7 +13993,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14317,11 +14007,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14332,7 +14022,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14346,11 +14036,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14364,6 +14072,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -14401,7 +14127,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14412,7 +14138,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14423,7 +14149,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14434,7 +14160,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14445,7 +14171,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14456,7 +14182,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14467,7 +14193,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14478,7 +14204,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14518,7 +14244,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14529,7 +14255,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14540,7 +14266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14551,7 +14277,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14562,7 +14288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14573,7 +14299,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14584,7 +14310,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14595,7 +14321,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14606,7 +14332,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14617,7 +14343,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14628,7 +14354,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14639,7 +14365,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14650,7 +14376,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14661,7 +14387,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14672,7 +14398,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14690,7 +14416,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14701,7 +14427,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14712,7 +14438,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14723,7 +14449,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14734,7 +14460,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14745,7 +14471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14756,7 +14482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14767,7 +14493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14785,7 +14511,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14796,7 +14522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14807,7 +14533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14818,7 +14544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14829,7 +14555,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14840,7 +14566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14851,7 +14577,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -14869,7 +14595,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14887,7 +14613,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14916,7 +14642,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -14952,7 +14678,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14963,7 +14689,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14981,7 +14707,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -15028,17 +14754,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -15048,7 +14763,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15066,8 +14781,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -15084,6 +14799,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -15098,11 +14849,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15116,7 +14867,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -15134,11 +14885,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15152,7 +14903,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -15170,29 +14921,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15206,11 +14939,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15224,7 +14957,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -15275,7 +15008,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -15304,94 +15037,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15409,7 +15059,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15427,7 +15077,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15445,7 +15095,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15463,7 +15113,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15481,23 +15131,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -15510,8 +15149,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -15528,25 +15167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15560,40 +15181,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15607,11 +15199,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15625,7 +15217,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -15748,41 +15340,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -15800,7 +15366,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -15812,6 +15404,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -15819,8 +15430,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -15838,8 +15449,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -15857,8 +15468,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -15877,7 +15488,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -15896,7 +15507,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -15914,8 +15525,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -15924,7 +15535,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -15933,25 +15544,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -15959,26 +15551,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -15990,51 +15563,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -16042,8 +15570,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -16061,8 +15589,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -16075,133 +15603,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -16216,25 +15617,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -16252,7 +15635,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -16270,7 +15780,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -16288,11 +15798,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16306,11 +15816,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16324,7 +15834,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -16342,11 +15852,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16357,7 +15867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16371,11 +15881,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16389,7 +15899,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -16473,7 +15983,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -16524,7 +16034,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -16542,7 +16052,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -16560,7 +16070,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -16578,11 +16088,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -16600,7 +16110,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16611,7 +16121,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16622,7 +16132,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16633,7 +16143,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16684,7 +16194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16695,7 +16205,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16706,7 +16216,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16717,7 +16227,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16757,7 +16267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16768,7 +16278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16779,7 +16289,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16790,7 +16300,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16837,7 +16347,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16848,7 +16358,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16888,7 +16398,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16899,7 +16409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16953,7 +16463,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16971,7 +16481,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16989,7 +16499,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17018,7 +16528,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17047,7 +16557,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17058,7 +16568,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17076,23 +16586,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -17105,10 +16615,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -17116,10 +16626,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -17134,7 +16662,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17145,7 +16724,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17156,7 +16735,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17167,7 +16746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17178,7 +16757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17189,7 +16768,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17225,7 +16804,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -17243,74 +16822,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -17327,7 +16844,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17336,6 +16853,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -17350,7 +16922,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17368,7 +16940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17386,7 +16958,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17404,7 +16976,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17422,7 +16994,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17440,7 +17012,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17458,6 +17030,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -17483,11 +17120,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17498,7 +17135,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17509,7 +17146,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17520,7 +17157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17534,99 +17171,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -17636,8 +17186,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -17654,7 +17204,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17668,11 +17305,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17683,7 +17320,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17694,7 +17331,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17705,7 +17342,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17719,7 +17356,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -17737,7 +17374,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -17755,29 +17392,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17791,29 +17410,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17831,7 +17432,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17849,7 +17450,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17867,7 +17468,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17885,7 +17486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17952,7 +17553,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -17971,7 +17572,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -17990,7 +17591,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -18009,7 +17610,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -18054,7 +17655,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -18073,7 +17674,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -18092,7 +17693,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -18111,7 +17712,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -18156,7 +17757,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -18175,7 +17776,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -18194,7 +17795,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -18213,7 +17814,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -18227,7 +17828,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18245,7 +17846,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18263,61 +17864,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18328,7 +17875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18339,7 +17886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18350,7 +17897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18364,11 +17911,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18379,7 +17926,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18390,7 +17937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18401,7 +17948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18415,11 +17962,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18430,7 +17977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18444,11 +17991,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18459,7 +18006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18473,12 +18020,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -18495,24 +18096,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -18524,7 +18107,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18546,7 +18129,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18568,7 +18151,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18579,7 +18162,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18593,7 +18176,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -18611,7 +18194,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -18626,7 +18209,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18637,7 +18220,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18651,11 +18234,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18666,7 +18249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18680,11 +18263,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18698,6 +18299,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -18735,7 +18354,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18746,7 +18365,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18757,7 +18376,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18768,7 +18387,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18779,7 +18398,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18790,7 +18409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18801,7 +18420,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18812,7 +18431,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18852,7 +18471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18863,7 +18482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18874,7 +18493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18885,7 +18504,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18896,7 +18515,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18907,7 +18526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18918,7 +18537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18929,7 +18548,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18940,7 +18559,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18951,7 +18570,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18962,7 +18581,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18973,7 +18592,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18984,7 +18603,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18995,7 +18614,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19006,7 +18625,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19024,7 +18643,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19035,7 +18654,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19046,7 +18665,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19057,7 +18676,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19068,7 +18687,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19079,7 +18698,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19090,7 +18709,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19101,7 +18720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19119,7 +18738,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19130,7 +18749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19141,7 +18760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19152,7 +18771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19163,7 +18782,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19174,7 +18793,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19185,7 +18804,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -19203,7 +18822,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19221,7 +18840,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19250,7 +18869,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19286,7 +18905,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19297,7 +18916,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19315,7 +18934,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -19362,17 +18981,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -19382,7 +18990,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19400,8 +19008,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -19418,6 +19026,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -19432,11 +19076,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19450,7 +19094,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -19468,11 +19112,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19486,7 +19130,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -19504,29 +19148,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19540,11 +19166,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19558,7 +19184,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -19609,7 +19235,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -19638,94 +19264,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19743,7 +19286,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19761,7 +19304,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19779,7 +19322,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19797,7 +19340,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19815,23 +19358,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -19844,8 +19376,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -19862,25 +19394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19894,40 +19408,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19941,11 +19426,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19959,7 +19444,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -20082,41 +19567,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -20134,7 +19593,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -20146,6 +19631,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -20153,8 +19657,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -20172,8 +19676,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -20191,8 +19695,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -20211,7 +19715,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -20230,7 +19734,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -20248,8 +19752,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -20258,7 +19762,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -20267,25 +19771,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -20293,26 +19778,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -20324,51 +19790,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -20376,8 +19797,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -20395,8 +19816,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -20409,133 +19830,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -20550,25 +19844,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -20586,7 +19862,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -20604,7 +20007,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -20622,11 +20025,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20640,11 +20043,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20658,7 +20061,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -20676,11 +20079,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20691,7 +20094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20705,11 +20108,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20723,7 +20126,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -20807,7 +20210,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -20858,7 +20261,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -20876,7 +20279,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -20894,7 +20297,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -20912,11 +20315,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -20934,7 +20337,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20945,7 +20348,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20956,7 +20359,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20967,7 +20370,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21018,7 +20421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21029,7 +20432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21040,7 +20443,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21051,7 +20454,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21091,7 +20494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21102,7 +20505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21113,7 +20516,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21124,7 +20527,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21171,7 +20574,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21182,7 +20585,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21222,7 +20625,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21233,7 +20636,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21287,7 +20690,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21305,7 +20708,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21323,7 +20726,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21352,7 +20755,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21381,7 +20784,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21392,7 +20795,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21410,23 +20813,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -21439,10 +20842,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -21450,10 +20853,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -21468,7 +20889,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21479,7 +20951,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21490,7 +20962,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21501,7 +20973,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21512,7 +20984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21523,7 +20995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21559,7 +21031,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -21577,74 +21049,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -21661,7 +21071,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21670,6 +21080,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -21684,7 +21149,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21702,7 +21167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21720,7 +21185,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21738,7 +21203,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21756,7 +21221,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21774,7 +21239,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21792,6 +21257,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -21817,11 +21347,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21832,7 +21362,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21843,7 +21373,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21854,7 +21384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21868,99 +21398,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -21970,8 +21413,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -21988,7 +21431,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22002,11 +21532,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22017,7 +21547,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22028,7 +21558,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22039,7 +21569,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22053,7 +21583,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -22071,7 +21601,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -22089,29 +21619,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22125,29 +21637,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22165,7 +21659,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22183,7 +21677,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22201,7 +21695,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22219,7 +21713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22286,7 +21780,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -22305,7 +21799,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -22324,7 +21818,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -22343,7 +21837,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -22388,7 +21882,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -22407,7 +21901,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -22426,7 +21920,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -22445,7 +21939,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -22490,7 +21984,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -22509,7 +22003,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -22528,7 +22022,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -22547,7 +22041,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -22561,7 +22055,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22579,7 +22073,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22597,61 +22091,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22662,7 +22102,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22673,7 +22113,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22684,7 +22124,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22698,11 +22138,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22713,7 +22153,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22724,7 +22164,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22735,7 +22175,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22749,11 +22189,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22764,7 +22204,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22778,11 +22218,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22793,7 +22233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22807,12 +22247,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -22829,24 +22323,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -22858,7 +22334,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22880,7 +22356,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22902,7 +22378,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22913,7 +22389,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22927,7 +22403,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -22945,7 +22421,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -22960,7 +22436,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22971,7 +22447,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22985,11 +22461,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23000,7 +22476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23014,11 +22490,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23032,6 +22526,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -23069,7 +22581,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23080,7 +22592,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23091,7 +22603,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23102,7 +22614,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23113,7 +22625,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23124,7 +22636,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23135,7 +22647,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23146,7 +22658,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23186,7 +22698,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23197,7 +22709,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23208,7 +22720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23219,7 +22731,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23230,7 +22742,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23241,7 +22753,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23252,7 +22764,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23263,7 +22775,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23274,7 +22786,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23285,7 +22797,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23296,7 +22808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23307,7 +22819,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23318,7 +22830,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23329,7 +22841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23340,7 +22852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23358,7 +22870,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23369,7 +22881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23380,7 +22892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23391,7 +22903,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23402,7 +22914,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23413,7 +22925,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23424,7 +22936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23435,7 +22947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23453,7 +22965,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23464,7 +22976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23475,7 +22987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23486,7 +22998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23497,7 +23009,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23508,7 +23020,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23519,7 +23031,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -23537,7 +23049,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23555,7 +23067,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23584,7 +23096,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -23620,7 +23132,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23631,7 +23143,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23649,7 +23161,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -23696,17 +23208,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -23716,7 +23217,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23734,8 +23235,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -23752,6 +23253,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -23766,11 +23303,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23784,7 +23321,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -23802,11 +23339,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23820,7 +23357,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -23838,29 +23375,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23874,11 +23393,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23892,7 +23411,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -23943,7 +23462,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -23972,94 +23491,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24077,7 +23513,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24095,7 +23531,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24113,7 +23549,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24131,7 +23567,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24149,23 +23585,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -24178,8 +23603,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -24196,25 +23621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24228,40 +23635,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24275,11 +23653,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24293,7 +23671,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -24416,41 +23794,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -24468,7 +23820,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -24480,6 +23858,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -24487,8 +23884,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -24506,8 +23903,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -24525,8 +23922,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -24545,7 +23942,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -24564,7 +23961,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -24582,8 +23979,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -24592,7 +23989,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -24601,25 +23998,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -24627,26 +24005,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -24658,51 +24017,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -24710,8 +24024,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -24729,8 +24043,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -24743,133 +24057,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -24884,25 +24071,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -24920,7 +24089,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -24938,7 +24234,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -24956,11 +24252,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24974,11 +24270,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24992,7 +24288,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -25010,11 +24306,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25025,7 +24321,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25039,11 +24335,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25057,7 +24353,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -25141,7 +24437,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -25192,7 +24488,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -25210,7 +24506,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -25228,7 +24524,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -25246,11 +24542,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -25268,7 +24564,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25279,7 +24575,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25290,7 +24586,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25301,7 +24597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25352,7 +24648,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25363,7 +24659,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25374,7 +24670,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25385,7 +24681,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25425,7 +24721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25436,7 +24732,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25447,7 +24743,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25458,7 +24754,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25505,7 +24801,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25516,7 +24812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25556,7 +24852,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25567,7 +24863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25621,7 +24917,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25639,7 +24935,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25657,7 +24953,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25686,7 +24982,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25715,7 +25011,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -25726,7 +25022,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -25744,23 +25040,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -25773,10 +25069,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -25784,10 +25080,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -25802,7 +25116,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25813,7 +25178,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25824,7 +25189,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25835,7 +25200,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25846,7 +25211,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25857,7 +25222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25893,7 +25258,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -25911,74 +25276,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -25995,7 +25298,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26004,6 +25307,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -26018,7 +25376,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26036,7 +25394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26054,7 +25412,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26072,7 +25430,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26090,7 +25448,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26108,7 +25466,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26126,6 +25484,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -26151,11 +25574,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26166,7 +25589,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26177,7 +25600,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26188,7 +25611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26202,99 +25625,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -26304,8 +25640,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -26322,7 +25658,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26336,11 +25759,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26351,7 +25774,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26362,7 +25785,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26373,7 +25796,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26387,7 +25810,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -26405,7 +25828,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -26423,29 +25846,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26459,29 +25864,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26499,7 +25886,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26517,7 +25904,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26535,7 +25922,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26553,7 +25940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26620,7 +26007,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -26639,7 +26026,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -26658,7 +26045,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -26677,7 +26064,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -26722,7 +26109,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -26741,7 +26128,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -26760,7 +26147,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -26779,7 +26166,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -26824,7 +26211,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -26843,7 +26230,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -26862,7 +26249,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -26881,7 +26268,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -26895,7 +26282,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26913,7 +26300,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26931,61 +26318,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26996,7 +26329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27007,7 +26340,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27018,7 +26351,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27032,11 +26365,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27047,7 +26380,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27058,7 +26391,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27069,7 +26402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27083,11 +26416,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27098,7 +26431,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27112,11 +26445,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27127,7 +26460,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27141,12 +26474,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -27163,24 +26550,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -27192,7 +26561,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27214,7 +26583,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27236,7 +26605,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27247,7 +26616,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27261,7 +26630,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -27279,7 +26648,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -27294,7 +26663,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27305,7 +26674,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27319,11 +26688,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27334,7 +26703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27348,11 +26717,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27366,6 +26753,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -27403,7 +26808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27414,7 +26819,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27425,7 +26830,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27436,7 +26841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27447,7 +26852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27458,7 +26863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27469,7 +26874,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27480,7 +26885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27520,7 +26925,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27531,7 +26936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27542,7 +26947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27553,7 +26958,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27564,7 +26969,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27575,7 +26980,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27586,7 +26991,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27597,7 +27002,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27608,7 +27013,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27619,7 +27024,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27630,7 +27035,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27641,7 +27046,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27652,7 +27057,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27663,7 +27068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27674,7 +27079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27692,7 +27097,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27703,7 +27108,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27714,7 +27119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27725,7 +27130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27736,7 +27141,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27747,7 +27152,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27758,7 +27163,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27769,7 +27174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27787,7 +27192,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27798,7 +27203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27809,7 +27214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27820,7 +27225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27831,7 +27236,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27842,7 +27247,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27853,7 +27258,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -27871,7 +27276,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27889,7 +27294,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27918,7 +27323,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -27954,7 +27359,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27965,7 +27370,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27983,7 +27388,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -28030,17 +27435,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -28050,7 +27444,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28068,8 +27462,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -28086,6 +27480,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -28100,11 +27530,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28118,7 +27548,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -28136,11 +27566,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28154,7 +27584,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -28172,29 +27602,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28208,11 +27620,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28226,7 +27638,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -28277,7 +27689,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -28306,94 +27718,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28411,7 +27740,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28429,7 +27758,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28447,7 +27776,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28465,7 +27794,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28483,23 +27812,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -28512,8 +27830,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -28530,25 +27848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28562,40 +27862,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28609,11 +27880,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28627,7 +27898,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -28750,41 +28021,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -28802,7 +28047,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -28814,6 +28085,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -28821,8 +28111,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -28840,8 +28130,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -28859,8 +28149,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -28879,7 +28169,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -28898,7 +28188,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -28916,8 +28206,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -28926,7 +28216,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -28935,25 +28225,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -28961,26 +28232,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -28992,51 +28244,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -29044,8 +28251,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -29063,8 +28270,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -29077,133 +28284,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -29218,25 +28298,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -29254,7 +28316,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -29272,7 +28461,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -29290,11 +28479,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29308,11 +28497,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29326,7 +28515,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -29344,11 +28533,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29359,7 +28548,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29373,11 +28562,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29391,7 +28580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -29475,7 +28664,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -29526,7 +28715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -29544,7 +28733,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -29562,7 +28751,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -29580,11 +28769,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -29602,7 +28791,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29613,7 +28802,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29624,7 +28813,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29635,7 +28824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29686,7 +28875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29697,7 +28886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29708,7 +28897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29719,7 +28908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29759,7 +28948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29770,7 +28959,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29781,7 +28970,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29792,7 +28981,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29839,7 +29028,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29850,7 +29039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29890,7 +29079,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29901,7 +29090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29955,7 +29144,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29973,7 +29162,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29991,7 +29180,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30020,7 +29209,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30049,7 +29238,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30060,7 +29249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30078,23 +29267,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -30107,10 +29296,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -30118,10 +29307,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -30136,7 +29343,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30147,7 +29405,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30158,7 +29416,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30169,7 +29427,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30180,7 +29438,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30191,7 +29449,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30227,7 +29485,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -30245,74 +29503,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -30329,7 +29525,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30338,6 +29534,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -30352,7 +29603,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30370,7 +29621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30388,7 +29639,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30406,7 +29657,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30424,7 +29675,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30442,7 +29693,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30460,6 +29711,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -30485,11 +29801,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30500,7 +29816,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30511,7 +29827,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30522,7 +29838,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30536,99 +29852,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -30638,8 +29867,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -30656,7 +29885,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30670,11 +29986,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30685,7 +30001,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30696,7 +30012,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30707,7 +30023,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30721,7 +30037,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -30739,7 +30055,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -30757,29 +30073,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30793,29 +30091,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30833,7 +30113,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30851,7 +30131,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30869,7 +30149,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30887,7 +30167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30954,7 +30234,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -30973,7 +30253,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -30992,7 +30272,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -31011,7 +30291,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -31056,7 +30336,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -31075,7 +30355,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -31094,7 +30374,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -31113,7 +30393,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -31158,7 +30438,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -31177,7 +30457,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -31196,7 +30476,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -31215,7 +30495,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -31229,7 +30509,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31247,7 +30527,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31265,61 +30545,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31330,7 +30556,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31341,7 +30567,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31352,7 +30578,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31366,11 +30592,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31381,7 +30607,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31392,7 +30618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31403,7 +30629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31417,11 +30643,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31432,7 +30658,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31446,11 +30672,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31461,7 +30687,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31475,12 +30701,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -31497,24 +30777,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -31526,7 +30788,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31548,7 +30810,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31570,7 +30832,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31581,7 +30843,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31595,7 +30857,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -31613,7 +30875,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -31628,7 +30890,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31639,7 +30901,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31653,11 +30915,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31668,7 +30930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31682,11 +30944,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31700,6 +30980,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -31737,7 +31035,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31748,7 +31046,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31759,7 +31057,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31770,7 +31068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31781,7 +31079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31792,7 +31090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31803,7 +31101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31814,7 +31112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31854,7 +31152,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31865,7 +31163,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31876,7 +31174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31887,7 +31185,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31898,7 +31196,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31909,7 +31207,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31920,7 +31218,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31931,7 +31229,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31942,7 +31240,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31953,7 +31251,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31964,7 +31262,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31975,7 +31273,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31986,7 +31284,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31997,7 +31295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32008,7 +31306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32026,7 +31324,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32037,7 +31335,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32048,7 +31346,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32059,7 +31357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32070,7 +31368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32081,7 +31379,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32092,7 +31390,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32103,7 +31401,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32121,7 +31419,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32132,7 +31430,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32143,7 +31441,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32154,7 +31452,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32165,7 +31463,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32176,7 +31474,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32187,7 +31485,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -32205,7 +31503,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32223,7 +31521,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32252,7 +31550,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32288,7 +31586,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -32299,7 +31597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -32317,7 +31615,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -32364,17 +31662,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -32384,7 +31671,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32402,8 +31689,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -32420,6 +31707,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -32434,11 +31757,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32452,7 +31775,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -32470,11 +31793,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32488,7 +31811,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -32506,29 +31829,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32542,11 +31847,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32560,7 +31865,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -32611,7 +31916,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -32640,94 +31945,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32745,7 +31967,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32763,7 +31985,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32781,7 +32003,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32799,7 +32021,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32817,23 +32039,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -32846,8 +32057,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -32864,25 +32075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32896,40 +32089,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32943,11 +32107,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32961,7 +32125,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -33084,41 +32248,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -33136,7 +32274,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -33148,6 +32312,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -33155,8 +32338,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -33174,8 +32357,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -33193,8 +32376,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -33213,7 +32396,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -33232,7 +32415,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -33250,8 +32433,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -33260,7 +32443,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -33269,25 +32452,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -33295,26 +32459,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -33326,51 +32471,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -33378,8 +32478,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -33397,8 +32497,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -33411,133 +32511,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -33552,25 +32525,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -33588,7 +32543,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -33606,7 +32688,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -33624,11 +32706,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33642,11 +32724,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33660,7 +32742,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -33678,11 +32760,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33693,7 +32775,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33707,11 +32789,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33725,7 +32807,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -33809,7 +32891,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -33860,7 +32942,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -33878,7 +32960,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -33896,7 +32978,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -33914,11 +32996,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -33936,7 +33018,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33947,7 +33029,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33958,7 +33040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33969,7 +33051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34020,7 +33102,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34031,7 +33113,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34042,7 +33124,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34053,7 +33135,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34093,7 +33175,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34104,7 +33186,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34115,7 +33197,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34126,7 +33208,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34173,7 +33255,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34184,7 +33266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34224,7 +33306,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34235,7 +33317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34289,7 +33371,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34307,7 +33389,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34325,7 +33407,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34354,7 +33436,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34383,7 +33465,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -34394,7 +33476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -34412,23 +33494,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -34441,10 +33523,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -34452,10 +33534,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -34470,7 +33570,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34481,7 +33632,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34492,7 +33643,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34503,7 +33654,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34514,7 +33665,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34525,7 +33676,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34561,7 +33712,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -34579,74 +33730,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -34663,7 +33752,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34672,6 +33761,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -34686,7 +33830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34704,7 +33848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34722,7 +33866,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34740,7 +33884,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34758,7 +33902,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34776,7 +33920,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34794,6 +33938,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -34819,11 +34028,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34834,7 +34043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34845,7 +34054,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34856,7 +34065,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34870,99 +34079,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -34972,8 +34094,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -34990,7 +34112,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35004,11 +34213,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35019,7 +34228,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35030,7 +34239,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35041,7 +34250,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35055,7 +34264,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -35073,7 +34282,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -35091,29 +34300,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35127,29 +34318,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35167,7 +34340,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35185,7 +34358,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35203,7 +34376,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35221,7 +34394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35288,7 +34461,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -35307,7 +34480,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -35326,7 +34499,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -35345,7 +34518,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -35390,7 +34563,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -35409,7 +34582,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -35428,7 +34601,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -35447,7 +34620,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -35492,7 +34665,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -35511,7 +34684,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -35530,7 +34703,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -35549,7 +34722,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -35563,7 +34736,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35581,7 +34754,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35599,61 +34772,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35664,7 +34783,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35675,7 +34794,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35686,7 +34805,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35700,11 +34819,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35715,7 +34834,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35726,7 +34845,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35737,7 +34856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35751,11 +34870,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35766,7 +34885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35780,11 +34899,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35795,7 +34914,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35809,12 +34928,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -35831,24 +35004,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -35860,7 +35015,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35882,7 +35037,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35904,7 +35059,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35915,7 +35070,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35929,7 +35084,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -35947,7 +35102,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -35962,7 +35117,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35973,7 +35128,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35987,11 +35142,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36002,7 +35157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36016,11 +35171,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36034,6 +35207,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -36071,7 +35262,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36082,7 +35273,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36093,7 +35284,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36104,7 +35295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36115,7 +35306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36126,7 +35317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36137,7 +35328,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36148,7 +35339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36188,7 +35379,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36199,7 +35390,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36210,7 +35401,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36221,7 +35412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36232,7 +35423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36243,7 +35434,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36254,7 +35445,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36265,7 +35456,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36276,7 +35467,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36287,7 +35478,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36298,7 +35489,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36309,7 +35500,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36320,7 +35511,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36331,7 +35522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36342,7 +35533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36360,7 +35551,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36371,7 +35562,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36382,7 +35573,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36393,7 +35584,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36404,7 +35595,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36415,7 +35606,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36426,7 +35617,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36437,7 +35628,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36455,7 +35646,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36466,7 +35657,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36477,7 +35668,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36488,7 +35679,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36499,7 +35690,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36510,7 +35701,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36521,7 +35712,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -36539,7 +35730,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36557,7 +35748,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36586,7 +35777,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -36622,7 +35813,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36633,7 +35824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36651,7 +35842,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -36698,17 +35889,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -36718,7 +35898,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36736,8 +35916,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -36754,6 +35934,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -36768,11 +35984,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36786,7 +36002,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -36804,11 +36020,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36822,7 +36038,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -36840,29 +36056,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36876,11 +36074,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36894,7 +36092,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -36945,7 +36143,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -36974,94 +36172,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37079,7 +36194,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37097,7 +36212,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37115,7 +36230,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37133,7 +36248,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37151,23 +36266,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -37180,8 +36284,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -37198,25 +36302,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37230,40 +36316,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37277,11 +36334,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37295,7 +36352,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -37418,41 +36475,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -37470,7 +36501,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -37482,6 +36539,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -37489,8 +36565,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -37508,8 +36584,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -37527,8 +36603,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -37547,7 +36623,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -37566,7 +36642,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -37584,8 +36660,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -37594,7 +36670,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -37603,25 +36679,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -37629,26 +36686,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -37660,51 +36698,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -37712,8 +36705,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -37731,8 +36724,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -37745,133 +36738,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -37886,25 +36752,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -37922,7 +36770,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -37940,7 +36915,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -37958,11 +36933,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -37976,11 +36951,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -37994,7 +36969,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -38012,11 +36987,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38027,7 +37002,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38041,11 +37016,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38059,7 +37034,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -38143,7 +37118,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -38194,7 +37169,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -38212,7 +37187,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -38230,7 +37205,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -38248,11 +37223,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -38270,7 +37245,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38281,7 +37256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38292,7 +37267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38303,7 +37278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38354,7 +37329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38365,7 +37340,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38376,7 +37351,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38387,7 +37362,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38427,7 +37402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38438,7 +37413,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38449,7 +37424,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38460,7 +37435,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38507,7 +37482,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38518,7 +37493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38558,7 +37533,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38569,7 +37544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38623,7 +37598,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38641,7 +37616,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38659,7 +37634,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38688,7 +37663,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38717,7 +37692,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -38728,7 +37703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -38746,23 +37721,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -38775,10 +37750,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -38786,10 +37761,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -38804,7 +37797,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38815,7 +37859,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38826,7 +37870,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38837,7 +37881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38848,7 +37892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38859,7 +37903,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38895,7 +37939,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -38913,74 +37957,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -38997,7 +37979,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39006,6 +37988,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -39020,7 +38057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39038,7 +38075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39056,7 +38093,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39074,7 +38111,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39092,7 +38129,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39110,7 +38147,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39128,6 +38165,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -39153,11 +38255,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39168,7 +38270,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39179,7 +38281,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39190,7 +38292,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39204,99 +38306,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -39306,8 +38321,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -39324,7 +38339,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39338,11 +38440,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39353,7 +38455,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39364,7 +38466,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39375,7 +38477,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39389,7 +38491,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -39407,7 +38509,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -39425,29 +38527,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39461,29 +38545,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39501,7 +38567,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39519,7 +38585,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39537,7 +38603,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39555,7 +38621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39622,7 +38688,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -39641,7 +38707,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -39660,7 +38726,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -39679,7 +38745,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -39724,7 +38790,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -39743,7 +38809,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -39762,7 +38828,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -39781,7 +38847,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -39826,7 +38892,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -39845,7 +38911,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -39864,7 +38930,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -39883,7 +38949,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -39897,7 +38963,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39915,7 +38981,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39933,61 +38999,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39998,7 +39010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40009,7 +39021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40020,7 +39032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40034,11 +39046,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40049,7 +39061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40060,7 +39072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40071,7 +39083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40085,11 +39097,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40100,7 +39112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40114,11 +39126,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40129,7 +39141,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40143,12 +39155,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -40165,24 +39231,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -40194,7 +39242,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40216,7 +39264,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40238,7 +39286,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40249,7 +39297,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40263,7 +39311,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -40281,7 +39329,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -40296,7 +39344,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40307,7 +39355,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40321,11 +39369,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40336,7 +39384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40350,11 +39398,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40368,6 +39434,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -40405,7 +39489,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40416,7 +39500,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40427,7 +39511,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40438,7 +39522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40449,7 +39533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40460,7 +39544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40471,7 +39555,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40482,7 +39566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40522,7 +39606,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40533,7 +39617,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40544,7 +39628,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40555,7 +39639,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40566,7 +39650,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40577,7 +39661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40588,7 +39672,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40599,7 +39683,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40610,7 +39694,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40621,7 +39705,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40632,7 +39716,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40643,7 +39727,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40654,7 +39738,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40665,7 +39749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40676,7 +39760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40694,7 +39778,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40705,7 +39789,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40716,7 +39800,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40727,7 +39811,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40738,7 +39822,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40749,7 +39833,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40760,7 +39844,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40771,7 +39855,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40789,7 +39873,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40800,7 +39884,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40811,7 +39895,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40822,7 +39906,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40833,7 +39917,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40844,7 +39928,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40855,7 +39939,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -40873,7 +39957,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40891,7 +39975,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40920,7 +40004,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -40956,7 +40040,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40967,7 +40051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40985,7 +40069,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -41032,17 +40116,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -41052,7 +40125,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41070,8 +40143,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -41088,6 +40161,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -41102,11 +40211,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41120,7 +40229,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -41138,11 +40247,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41156,7 +40265,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -41174,29 +40283,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41210,11 +40301,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41228,7 +40319,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -41279,7 +40370,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -41308,94 +40399,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41413,7 +40421,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41431,7 +40439,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41449,7 +40457,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41467,7 +40475,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41485,23 +40493,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -41514,8 +40511,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -41532,25 +40529,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41564,40 +40543,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41611,11 +40561,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41629,7 +40579,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -41752,41 +40702,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -41804,7 +40728,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -41816,6 +40766,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -41823,8 +40792,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -41842,8 +40811,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -41861,8 +40830,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -41881,7 +40850,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -41900,7 +40869,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -41918,8 +40887,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -41928,7 +40897,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -41937,25 +40906,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -41963,26 +40913,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -41994,51 +40925,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -42046,8 +40932,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -42065,8 +40951,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -42079,133 +40965,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -42220,25 +40979,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -42256,7 +40997,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -42274,7 +41142,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -42292,11 +41160,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42310,11 +41178,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42328,7 +41196,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -42346,11 +41214,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42361,7 +41229,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42375,11 +41243,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42393,7 +41261,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -42477,7 +41345,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -42528,7 +41396,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -42546,7 +41414,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -42564,7 +41432,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -42582,11 +41450,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -42604,7 +41472,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42615,7 +41483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42626,7 +41494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42637,7 +41505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42688,7 +41556,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42699,7 +41567,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42710,7 +41578,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42721,7 +41589,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42761,7 +41629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42772,7 +41640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42783,7 +41651,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42794,7 +41662,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42841,7 +41709,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42852,7 +41720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42892,7 +41760,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42903,7 +41771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42957,7 +41825,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42975,7 +41843,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42993,7 +41861,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43022,7 +41890,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43051,7 +41919,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43062,7 +41930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43080,23 +41948,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -43109,10 +41977,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -43120,10 +41988,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -43138,7 +42024,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43149,7 +42086,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43160,7 +42097,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43171,7 +42108,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43182,7 +42119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43193,7 +42130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43229,7 +42166,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -43247,74 +42184,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -43331,7 +42206,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43340,6 +42215,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -43354,7 +42284,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43372,7 +42302,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43390,7 +42320,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43408,7 +42338,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43426,7 +42356,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43444,7 +42374,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43462,6 +42392,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -43487,11 +42482,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43502,7 +42497,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43513,7 +42508,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43524,7 +42519,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43538,99 +42533,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -43640,8 +42548,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -43658,7 +42566,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43672,11 +42667,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43687,7 +42682,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43698,7 +42693,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43709,7 +42704,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43723,7 +42718,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -43741,7 +42736,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -43759,29 +42754,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43795,29 +42772,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43835,7 +42794,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43853,7 +42812,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43871,7 +42830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43889,7 +42848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43956,7 +42915,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -43975,7 +42934,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -43994,7 +42953,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -44013,7 +42972,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -44058,7 +43017,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -44077,7 +43036,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -44096,7 +43055,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -44115,7 +43074,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -44160,7 +43119,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -44179,7 +43138,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -44198,7 +43157,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -44217,7 +43176,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -44231,7 +43190,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44249,7 +43208,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44267,61 +43226,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44332,7 +43237,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44343,7 +43248,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44354,7 +43259,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44368,11 +43273,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44383,7 +43288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44394,7 +43299,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44405,7 +43310,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44419,11 +43324,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44434,7 +43339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44448,11 +43353,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44463,7 +43368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44477,12 +43382,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -44499,24 +43458,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -44528,7 +43469,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44550,7 +43491,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44572,7 +43513,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44583,7 +43524,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44597,7 +43538,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -44615,7 +43556,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -44630,7 +43571,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44641,7 +43582,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44655,11 +43596,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44670,7 +43611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44684,11 +43625,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44702,6 +43661,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -44739,7 +43716,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44750,7 +43727,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44761,7 +43738,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44772,7 +43749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44783,7 +43760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44794,7 +43771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44805,7 +43782,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44816,7 +43793,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44856,7 +43833,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44867,7 +43844,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44878,7 +43855,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44889,7 +43866,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44900,7 +43877,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44911,7 +43888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44922,7 +43899,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44933,7 +43910,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44944,7 +43921,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44955,7 +43932,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44966,7 +43943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44977,7 +43954,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44988,7 +43965,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44999,7 +43976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45010,7 +43987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45028,7 +44005,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45039,7 +44016,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45050,7 +44027,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45061,7 +44038,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45072,7 +44049,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45083,7 +44060,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45094,7 +44071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45105,7 +44082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45123,7 +44100,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45134,7 +44111,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45145,7 +44122,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45156,7 +44133,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45167,7 +44144,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45178,7 +44155,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45189,7 +44166,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -45207,7 +44184,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45225,7 +44202,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45254,7 +44231,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45290,7 +44267,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -45301,7 +44278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -45319,7 +44296,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -45366,17 +44343,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -45386,7 +44352,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45404,8 +44370,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -45422,6 +44388,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -45436,11 +44438,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45454,7 +44456,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -45472,11 +44474,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45490,7 +44492,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -45508,29 +44510,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45544,11 +44528,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45562,7 +44546,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -45613,7 +44597,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -45642,94 +44626,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45747,7 +44648,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45765,7 +44666,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45783,7 +44684,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45801,7 +44702,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45819,23 +44720,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -45848,8 +44738,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -45866,25 +44756,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45898,40 +44770,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45945,11 +44788,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45963,7 +44806,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -46086,41 +44929,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -46138,7 +44955,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -46150,6 +44993,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -46157,8 +45019,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -46176,8 +45038,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -46195,8 +45057,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -46215,7 +45077,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -46234,7 +45096,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -46252,8 +45114,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -46262,7 +45124,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -46271,25 +45133,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -46297,26 +45140,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -46328,51 +45152,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -46380,8 +45159,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -46399,8 +45178,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -46413,133 +45192,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -46554,25 +45206,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -46590,7 +45224,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -46608,7 +45369,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -46626,11 +45387,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46644,11 +45405,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46662,7 +45423,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -46680,11 +45441,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46695,7 +45456,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46709,11 +45470,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46727,7 +45488,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -46811,7 +45572,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -46862,7 +45623,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -46880,7 +45641,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -46898,7 +45659,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -46916,11 +45677,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -46938,7 +45699,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46949,7 +45710,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46960,7 +45721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46971,7 +45732,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47022,7 +45783,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47033,7 +45794,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47044,7 +45805,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47055,7 +45816,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47095,7 +45856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47106,7 +45867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47117,7 +45878,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47128,7 +45889,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47175,7 +45936,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47186,7 +45947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47226,7 +45987,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47237,7 +45998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47291,7 +46052,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47309,7 +46070,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47327,7 +46088,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47356,7 +46117,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47385,7 +46146,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -47396,7 +46157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -47414,23 +46175,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -47443,10 +46204,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -47454,10 +46215,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -47472,7 +46251,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47483,7 +46313,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47494,7 +46324,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47505,7 +46335,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47516,7 +46346,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47527,7 +46357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47563,7 +46393,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -47581,74 +46411,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -47665,7 +46433,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47674,6 +46442,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -47688,7 +46511,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47706,7 +46529,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47724,7 +46547,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47742,7 +46565,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47760,7 +46583,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47778,7 +46601,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47796,6 +46619,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -47821,11 +46709,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47836,7 +46724,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47847,7 +46735,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47858,7 +46746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47872,99 +46760,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -47974,8 +46775,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -47992,7 +46793,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48006,11 +46894,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48021,7 +46909,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48032,7 +46920,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48043,7 +46931,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48057,7 +46945,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -48075,7 +46963,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -48093,29 +46981,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48129,29 +46999,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48169,7 +47021,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48187,7 +47039,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48205,7 +47057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48223,7 +47075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48290,7 +47142,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -48309,7 +47161,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -48328,7 +47180,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -48347,7 +47199,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -48392,7 +47244,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -48411,7 +47263,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -48430,7 +47282,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -48449,7 +47301,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -48494,7 +47346,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -48513,7 +47365,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -48532,7 +47384,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -48551,7 +47403,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -48565,7 +47417,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48583,7 +47435,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48601,61 +47453,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48666,7 +47464,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48677,7 +47475,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48688,7 +47486,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48702,11 +47500,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48717,7 +47515,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48728,7 +47526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48739,7 +47537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48753,11 +47551,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48768,7 +47566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48782,11 +47580,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48797,7 +47595,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48811,12 +47609,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -48833,24 +47685,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -48862,7 +47696,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48884,7 +47718,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48906,7 +47740,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48917,7 +47751,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48931,7 +47765,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -48949,7 +47783,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -48964,7 +47798,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48975,7 +47809,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48989,11 +47823,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49004,7 +47838,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49018,11 +47852,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49036,6 +47888,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -49073,7 +47943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49084,7 +47954,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49095,7 +47965,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49106,7 +47976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49117,7 +47987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49128,7 +47998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49139,7 +48009,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49150,7 +48020,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49190,7 +48060,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49201,7 +48071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49212,7 +48082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49223,7 +48093,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49234,7 +48104,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49245,7 +48115,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49256,7 +48126,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49267,7 +48137,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49278,7 +48148,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49289,7 +48159,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49300,7 +48170,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49311,7 +48181,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49322,7 +48192,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49333,7 +48203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49344,7 +48214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49362,7 +48232,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49373,7 +48243,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49384,7 +48254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49395,7 +48265,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49406,7 +48276,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49417,7 +48287,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49428,7 +48298,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49439,7 +48309,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49457,7 +48327,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49468,7 +48338,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49479,7 +48349,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49490,7 +48360,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49501,7 +48371,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49512,7 +48382,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49523,7 +48393,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -49541,7 +48411,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49559,7 +48429,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49588,7 +48458,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -49624,7 +48494,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49635,7 +48505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49653,7 +48523,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -49700,17 +48570,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -49720,7 +48579,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49738,8 +48597,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -49756,6 +48615,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -49770,11 +48665,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49788,7 +48683,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -49806,11 +48701,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49824,7 +48719,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -49842,29 +48737,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49878,11 +48755,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49896,7 +48773,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -49947,7 +48824,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -49976,94 +48853,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50081,7 +48875,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50099,7 +48893,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50117,7 +48911,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50135,7 +48929,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50153,23 +48947,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -50182,8 +48965,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -50200,25 +48983,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50232,40 +48997,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50279,11 +49015,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50297,7 +49033,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -50420,41 +49156,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -50472,7 +49182,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -50484,6 +49220,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -50491,8 +49246,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -50510,8 +49265,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -50529,8 +49284,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -50549,7 +49304,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -50568,7 +49323,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -50586,8 +49341,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -50596,7 +49351,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -50605,25 +49360,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -50631,26 +49367,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -50662,51 +49379,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -50714,8 +49386,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -50733,8 +49405,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -50747,133 +49419,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -50888,25 +49433,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -50924,7 +49451,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -50942,7 +49596,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -50960,11 +49614,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -50978,11 +49632,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -50996,7 +49650,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -51014,11 +49668,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51029,7 +49683,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51043,11 +49697,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51061,7 +49715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -51145,7 +49799,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -51196,7 +49850,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -51214,7 +49868,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -51232,7 +49886,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -51250,11 +49904,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -51272,7 +49926,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51283,7 +49937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51294,7 +49948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51305,7 +49959,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51356,7 +50010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51367,7 +50021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51378,7 +50032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51389,7 +50043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51429,7 +50083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51440,7 +50094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51451,7 +50105,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51462,7 +50116,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51509,7 +50163,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51520,7 +50174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51560,7 +50214,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51571,7 +50225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51625,7 +50279,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51643,7 +50297,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51661,7 +50315,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51690,7 +50344,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51719,7 +50373,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -51730,7 +50384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -51748,23 +50402,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -51777,10 +50431,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -51788,10 +50442,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -51806,7 +50478,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51817,7 +50540,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51828,7 +50551,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51839,7 +50562,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51850,7 +50573,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51861,7 +50584,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51897,7 +50620,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -51915,74 +50638,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -51999,7 +50660,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -52008,6 +50669,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -52047,7 +50763,7 @@
               {
                 "action_name": "act_0",
                 "action_handle": 536870914,
-                "table_name": "tbl_act_17",
+                "table_name": "tbl_act_15",
                 "next_table": 0,
                 "next_table_full": 16,
                 "vliw_instruction": 1,
@@ -52086,7 +50802,15 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W8" },
+              "src": [
+                { "type": "phv", "name": "W6" },
+                { "type": "phv", "name": "W7" }
               ]
             }
           ]
@@ -52109,7 +50833,7 @@
     {
       "direction": "egress",
       "handle": 16777218,
-      "name": "tbl_act_14",
+      "name": "tbl_act_13",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -52168,7 +50892,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 3 ],
+            "result_physical_buses": [ 2 ],
             "ternary_indirection_stage_table": {
               "stage_number": 0,
               "stage_table_type": "ternary_indirection",
@@ -52586,9 +51310,9 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "act_14",
+                  "action_name": "act_13",
                   "action_handle": 536870915,
-                  "table_name": "tbl_act_32",
+                  "table_name": "cond-19",
                   "next_table": 0,
                   "next_table_full": 2,
                   "vliw_instruction": 0,
@@ -52633,7 +51357,7 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "act_14",
+          "name": "act_13",
           "handle": 536870915,
           "indirect_resources": [],
           "allowed_as_default_action": true,
@@ -52653,10 +51377,10 @@
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
+              "dst": { "type": "phv", "name": "B26" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B28" }
+                { "type": "phv", "name": "B26" }
               ]
             }
           ]
@@ -52673,95 +51397,6 @@
     {
       "direction": "egress",
       "handle": 16777219,
-      "name": "tbl_act_15",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_15",
-                "action_handle": 536870916,
-                "table_name": "cond-20",
-                "next_table": 0,
-                "next_table_full": 3,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_15",
-          "handle": 536870916,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.dscp" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B21" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870916,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777220,
       "name": "tbl_int_egress_int_hop_cnt_increment",
       "table_type": "match",
       "size": 1,
@@ -52772,7 +51407,7 @@
             "stage_number": 0,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 4,
+            "logical_table_id": 3,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -52788,12 +51423,12 @@
             "action_format": [
               {
                 "action_name": "int_egress.int_hop_cnt_increment",
-                "action_handle": 536870917,
+                "action_handle": 536870916,
                 "table_name": "tbl_int_egress_int_hop_cnt_exceeded_0",
                 "next_table": 0,
-                "next_table_full": 7,
+                "next_table_full": 6,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
+                "vliw_instruction_full": 65,
                 "immediate_fields": []
               }
             ],
@@ -52806,7 +51441,7 @@
       "actions": [
         {
           "name": "int_egress.int_hop_cnt_increment",
-          "handle": 536870917,
+          "handle": 536870916,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -52835,6 +51470,109 @@
           ]
         }
       ],
+      "default_action_handle": 536870916,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": [],
+      "performs_hash_action": false,
+      "action_data_table_refs": [],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": []
+    },
+    {
+      "direction": "egress",
+      "handle": 16777220,
+      "name": "tbl_int_egress_int_transit",
+      "table_type": "match",
+      "size": 1,
+      "preferred_match_type": "exact",
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 0,
+            "size": 1,
+            "stage_table_type": "match_with_no_key",
+            "logical_table_id": 4,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "memory_resource_allocation": null,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 0,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0
+              }
+            ],
+            "result_physical_buses": [ 2 ],
+            "action_format": [
+              {
+                "action_name": "int_egress.int_transit",
+                "action_handle": 536870917,
+                "table_name": "tbl_int_egress_int_metadata_insert_int_set_header_0407_i12_0",
+                "next_table": 0,
+                "next_table_full": 5,
+                "vliw_instruction": 1,
+                "vliw_instruction_full": 66,
+                "immediate_fields": []
+              }
+            ],
+            "hash_functions": []
+          }
+        ],
+        "match_type": "match_with_no_key",
+        "uses_dynamic_key_masks": false
+      },
+      "actions": [
+        {
+          "name": "int_egress.int_transit",
+          "handle": 536870917,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
+              "src": [ { "immediate": "100" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operator": "shl",
+              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
+              "src": [
+                { "type": "phv", "name": "H20" },
+                { "type": "phv", "name": "H20" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B17" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "B16" }
+              ]
+            }
+          ]
+        }
+      ],
       "default_action_handle": 536870917,
       "action_profile": "",
       "default_next_table_mask": 0,
@@ -52852,7 +51590,7 @@
     {
       "direction": "egress",
       "handle": 16777221,
-      "name": "int_egress.int_prep",
+      "name": "tbl_int_egress_int_metadata_insert_int_set_header_0407_i12",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -52862,7 +51600,7 @@
             "size": 512,
             "stage_table_type": "ternary_match",
             "logical_table_id": 5,
-            "default_next_table": 6,
+            "default_next_table": 1,
             "has_attached_gateway": false,
             "pack_format": [
               {
@@ -52911,7 +51649,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "ternary_indirection_stage_table": {
               "stage_number": 0,
               "stage_table_type": "ternary_indirection",
@@ -52920,41 +51658,181 @@
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 8,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 123,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 107,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 91,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 64,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 75,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 59,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 43,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
                       "entry_number": 1,
                       "fields": [
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 11,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 65,
+                          "lsb_mem_word_offset": 16,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 31,
+                          "field_width": 5,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "--padding_33_63--"
+                          "lsb_mem_word_offset": 27,
+                          "field_name": "--padding_11_15--"
                         }
                       ]
                     },
@@ -52964,32 +51842,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 11,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 1,
+                          "lsb_mem_word_offset": 0,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 31,
+                          "field_width": 5,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "--padding_33_63--"
+                          "lsb_mem_word_offset": 11,
+                          "field_name": "--padding_11_15--"
                         }
                       ]
                     }
@@ -52999,30 +51867,37 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "NoAction",
-                  "action_handle": 536870919,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
-                  "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 68,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "int_egress.int_transit",
+                  "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
                   "action_handle": 536870918,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
+                  "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
                   "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 1,
+                  "next_table_full": 17,
+                  "vliw_instruction": 0,
                   "vliw_instruction_full": 67,
                   "immediate_fields": [
                     {
-                      "param_name": "switch_id",
-                      "param_type": "parameter",
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
                       "param_shift": 0,
                       "dest_start": 0,
-                      "dest_width": 32
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 2,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_5",
+                      "param_type": "constant",
+                      "const_value": 5,
+                      "param_shift": 0,
+                      "dest_start": 8,
+                      "dest_width": 3
                     }
                   ]
                 }
@@ -53039,8 +51914,8 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "NoAction",
-          "handle": 536870919,
+          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
+          "handle": 536870918,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -53056,60 +51931,33 @@
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
           "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_transit",
-          "handle": 536870918,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "switch_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
-              "src": [ { "type": "immediate", "name": "switch_id" } ]
+              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
+              "src": [ { "type": "phv", "name": "W19" } ]
             },
             {
               "name": "DirectAluPrimitive",
-              "operator": "shl",
-              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
+              "operation": "bitmasked-set",
+              "dst": { "type": "phv", "name": "B27" },
               "src": [
-                { "type": "phv", "name": "H18" },
-                { "type": "phv", "name": "H18" }
+                { "type": "immediate", "name": "$data0" },
+                { "type": "phv", "name": "B27" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B17" },
+              "dst": { "type": "phv", "name": "W18" },
               "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "B16" }
+                { "type": "phv", "name": "W16" },
+                { "type": "phv", "name": "W17" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870919,
+      "default_action_handle": 536870918,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -53120,4117 +51968,6 @@
     {
       "direction": "egress",
       "handle": 16777222,
-      "name": "int_egress.int_metadata_insert.int_inst_0407",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554433,
-          "name": "int_egress_int_metadata_insert_int_inst_0$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870920,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0407",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0407"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 6,
-            "default_next_table": 17,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-                "action_handle": 536870920,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-                "action_handle": 536870921,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-                "action_handle": 536870922,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-                "action_handle": 536870923,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_65",
-                    "param_type": "constant",
-                    "const_value": 65,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-                "action_handle": 536870924,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-                "action_handle": 536870925,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-                "action_handle": 536870926,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_66",
-                    "param_type": "constant",
-                    "const_value": 66,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-                "action_handle": 536870927,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_67",
-                    "param_type": "constant",
-                    "const_value": 67,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-                "action_handle": 536870928,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-                "action_handle": 536870929,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-                "action_handle": 536870930,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_80",
-                    "param_type": "constant",
-                    "const_value": 80,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-                "action_handle": 536870931,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_81",
-                    "param_type": "constant",
-                    "const_value": 81,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-                "action_handle": 536870932,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-                "action_handle": 536870933,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-                "action_handle": 536870934,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_82",
-                    "param_type": "constant",
-                    "const_value": 82,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-                "action_handle": 536870935,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 32,
-                "vliw_instruction_full": 96,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_83",
-                    "param_type": "constant",
-                    "const_value": 83,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 0,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 15,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 91,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 21,
-                            "field_name": "--padding_21_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 33554433,
-      "name": "int_egress_int_metadata_insert_int_inst_0$action",
-      "table_type": "action",
-      "size": 4096,
-      "stage_tables": [
-        {
-          "stage_number": 0,
-          "size": 4096,
-          "stage_table_type": "action_data",
-          "logical_table_id": 6,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870920
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870921
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870922
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870923
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870924
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870925
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870926
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870927
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870928
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870929
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870930
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870931
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870932
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870933
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870934
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870935
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777223,
       "name": "tbl_int_egress_int_hop_cnt_exceeded",
       "table_type": "match",
       "size": 1,
@@ -57241,7 +51978,7 @@
             "stage_number": 0,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 7,
+            "logical_table_id": 6,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57257,12 +51994,12 @@
             "action_format": [
               {
                 "action_name": "int_egress.int_hop_cnt_exceeded",
-                "action_handle": 536870936,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
+                "action_handle": 536870919,
+                "table_name": "tbl_act_27",
                 "next_table": 0,
                 "next_table_full": 21,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 71,
+                "vliw_instruction_full": 68,
                 "immediate_fields": []
               }
             ],
@@ -57275,7 +52012,7 @@
       "actions": [
         {
           "name": "int_egress.int_hop_cnt_exceeded",
-          "handle": 536870936,
+          "handle": 536870919,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57297,13 +52034,13 @@
               "dst": { "type": "phv", "name": "int_header.e" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H18" }
+                { "type": "phv", "name": "H20" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870936,
+      "default_action_handle": 536870919,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57319,7 +52056,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777224,
+      "handle": 16777223,
       "name": "tbl_act_0",
       "table_type": "match",
       "size": 1,
@@ -57346,8 +52083,8 @@
             "action_format": [
               {
                 "action_name": "act",
-                "action_handle": 536870937,
-                "table_name": "tbl_act_18",
+                "action_handle": 536870920,
+                "table_name": "tbl_act_16",
                 "next_table": 0,
                 "next_table_full": 32,
                 "vliw_instruction": 1,
@@ -57364,7 +52101,7 @@
       "actions": [
         {
           "name": "act",
-          "handle": 536870937,
+          "handle": 536870920,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57394,13 +52131,103 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870937,
+      "default_action_handle": 536870920,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": [],
+      "performs_hash_action": false,
+      "action_data_table_refs": [],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": []
+    },
+    {
+      "direction": "egress",
+      "handle": 16777224,
+      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
+      "table_type": "match",
+      "size": 1,
+      "preferred_match_type": "exact",
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 1,
+            "size": 1,
+            "stage_table_type": "match_with_no_key",
+            "logical_table_id": 1,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "memory_resource_allocation": null,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 0,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0
+              }
+            ],
+            "result_physical_buses": [ 2 ],
+            "action_format": [
+              {
+                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
+                "action_handle": 536870921,
+                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
+                "next_table": 0,
+                "next_table_full": 18,
+                "vliw_instruction": 1,
+                "vliw_instruction_full": 64,
+                "immediate_fields": []
+              }
+            ],
+            "hash_functions": []
+          }
+        ],
+        "match_type": "match_with_no_key",
+        "uses_dynamic_key_masks": false
+      },
+      "actions": [
+        {
+          "name": "int_egress.int_outer_encap.int_update_ipv4",
+          "handle": 536870921,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "ipv4.total_len" },
+              "src": [
+                { "type": "phv", "name": "H21" },
+                { "type": "phv", "name": "H19" }
+              ]
+            }
+          ]
+        }
+      ],
+      "default_action_handle": 536870921,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57427,7 +52254,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
+            "logical_table_id": 2,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57439,16 +52266,16 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
                 "action_name": "int_egress.int_outer_encap.int_update_shim",
-                "action_handle": 536870938,
+                "action_handle": 536870922,
                 "table_name": "tbl_int_egress_int_outer_encap_int_update_udp_0",
                 "next_table": 0,
-                "next_table_full": 18,
+                "next_table_full": 19,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
+                "vliw_instruction_full": 65,
                 "immediate_fields": []
               }
             ],
@@ -57461,7 +52288,7 @@
       "actions": [
         {
           "name": "int_egress.int_outer_encap.int_update_shim",
-          "handle": 536870938,
+          "handle": 536870922,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57490,7 +52317,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870938,
+      "default_action_handle": 536870922,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57517,7 +52344,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
+            "logical_table_id": 3,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57529,16 +52356,16 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 1 ],
+            "result_physical_buses": [ 0 ],
             "action_format": [
               {
                 "action_name": "int_egress.int_outer_encap.int_update_udp",
-                "action_handle": 536870939,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
+                "action_handle": 536870923,
+                "table_name": "tbl_int_egress_int_metadata_insert_int_set_header_0003_i13_0",
                 "next_table": 0,
-                "next_table_full": 19,
+                "next_table_full": 20,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
+                "vliw_instruction_full": 66,
                 "immediate_fields": []
               }
             ],
@@ -57551,7 +52378,7 @@
       "actions": [
         {
           "name": "int_egress.int_outer_encap.int_update_udp",
-          "handle": 536870939,
+          "handle": 536870923,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57573,8 +52400,8 @@
               "operation": "add",
               "dst": { "type": "phv", "name": "udp.len" },
               "src": [
-                { "type": "phv", "name": "H16" },
-                { "type": "phv", "name": "H17" }
+                { "type": "phv", "name": "H18" },
+                { "type": "phv", "name": "H19" }
               ]
             },
             {
@@ -57585,7 +52412,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870939,
+      "default_action_handle": 536870923,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57602,1530 +52429,7 @@
     {
       "direction": "egress",
       "handle": 16777227,
-      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 3,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
-                "action_handle": 536870940,
-                "table_name": "int_egress_int_metadata_insert_int_inst",
-                "next_table": 0,
-                "next_table_full": 20,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_outer_encap.int_update_ipv4",
-          "handle": 536870940,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [
-                { "type": "phv", "name": "H19" },
-                { "type": "phv", "name": "H17" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870940,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777228,
-      "name": "int_egress.int_metadata_insert.int_inst_0003",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870941,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0003",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0003"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 21,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-                "action_handle": 536870941,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 3,
-                "vliw_instruction_full": 67,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-                "action_handle": 536870942,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-                "action_handle": 536870949,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-                "action_handle": 536870943,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-                "action_handle": 536870944,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-                "action_handle": 536870945,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-                "action_handle": 536870946,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-                "action_handle": 536870947,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-                "action_handle": 536870948,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-                "action_handle": 536870950,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-                "action_handle": 536870951,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-                "action_handle": 536870952,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-                "action_handle": 536870953,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-                "action_handle": 536870954,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-                "action_handle": 536870955,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-                "action_handle": 536870956,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 1,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 16,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 90,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 22,
-                            "field_name": "--padding_22_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-          "handle": 536870941,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-          "handle": 536870942,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-          "handle": 536870949,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-          "handle": 536870943,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-          "handle": 536870944,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-          "handle": 536870945,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-          "handle": 536870946,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-          "handle": 536870947,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-          "handle": 536870948,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-          "handle": 536870950,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-          "handle": 536870951,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-          "handle": 536870952,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-          "handle": 536870953,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-          "handle": 536870954,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-          "handle": 536870955,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-          "handle": 536870956,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 16777229,
-      "name": "tbl_spgw_egress_gtpu_encap",
+      "name": "tbl_int_egress_int_metadata_insert_int_set_header_0003_i13",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -59134,9 +52438,9 @@
             "stage_number": 1,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 5,
-            "default_next_table": 6,
-            "has_attached_gateway": true,
+            "logical_table_id": 4,
+            "default_next_table": 5,
+            "has_attached_gateway": false,
             "pack_format": [
               {
                 "table_word_width": 0,
@@ -59202,32 +52506,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 121,
+                          "lsb_mem_word_offset": 120,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 127,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59237,32 +52531,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 113,
+                          "lsb_mem_word_offset": 112,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 119,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59272,32 +52556,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 105,
+                          "lsb_mem_word_offset": 104,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 111,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59307,32 +52581,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 97,
+                          "lsb_mem_word_offset": 96,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 103,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59342,32 +52606,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 89,
+                          "lsb_mem_word_offset": 88,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 95,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59377,32 +52631,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 81,
+                          "lsb_mem_word_offset": 80,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 87,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59412,32 +52656,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 73,
+                          "lsb_mem_word_offset": 72,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 79,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59447,32 +52681,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 65,
+                          "lsb_mem_word_offset": 64,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 71,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59482,32 +52706,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 57,
+                          "lsb_mem_word_offset": 56,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 63,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59517,32 +52731,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 49,
+                          "lsb_mem_word_offset": 48,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 55,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59552,32 +52756,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 41,
+                          "lsb_mem_word_offset": 40,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 47,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59587,32 +52781,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 33,
+                          "lsb_mem_word_offset": 32,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 39,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59622,32 +52806,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 25,
+                          "lsb_mem_word_offset": 24,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 31,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59657,32 +52831,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 17,
+                          "lsb_mem_word_offset": 16,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 23,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59692,32 +52856,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 9,
+                          "lsb_mem_word_offset": 8,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 15,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59727,32 +52881,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 1,
+                          "lsb_mem_word_offset": 0,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 7,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     }
@@ -59762,13 +52906,13 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "spgw_egress.gtpu_encap",
-                  "action_handle": 536870957,
-                  "table_name": "tbl_act_30",
+                  "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
+                  "action_handle": 536870924,
+                  "table_name": "tbl_act_27",
                   "next_table": 0,
-                  "next_table_full": 22,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 71,
+                  "next_table_full": 21,
+                  "vliw_instruction": 0,
+                  "vliw_instruction_full": 67,
                   "immediate_fields": [
                     {
                       "param_name": "constant_1",
@@ -59783,7 +52927,7 @@
                       "param_type": "constant",
                       "const_value": 1,
                       "param_shift": 0,
-                      "dest_start": 5,
+                      "dest_start": 3,
                       "dest_width": 1
                     },
                     {
@@ -59791,7 +52935,7 @@
                       "param_type": "constant",
                       "const_value": 1,
                       "param_shift": 0,
-                      "dest_start": 3,
+                      "dest_start": 5,
                       "dest_width": 1
                     }
                   ]
@@ -59802,21 +52946,15 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554434,
-          "name": "tbl_spgw_egress_gtpu_encap_0$action"
-        }
-      ],
+      "action_data_table_refs": [],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
+          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
+          "handle": 536870924,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -59831,87 +52969,59 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
           "primitives": [
             {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
               "src": [ { "type": "immediate", "name": "0" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
+              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
+              "src": [ { "type": "phv", "name": "W28" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
+              "src": [ { "type": "phv", "name": "B21" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
               "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
+                { "type": "phv", "name": "H33" },
+                { "type": "phv", "name": "H34" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
+              "dst": { "type": "phv", "name": "B27" },
+              "src": [
+                { "type": "immediate", "name": "$data0" },
+                { "type": "phv", "name": "B27" }
+              ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
+              "dst": { "type": "phv", "name": "H24" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "H23" }
+              ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
+              "dst": { "type": "phv", "name": "H25" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "H26" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870957,
+      "default_action_handle": 536870924,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -59921,334 +53031,8 @@
     },
     {
       "direction": "egress",
-      "handle": 33554434,
-      "name": "tbl_spgw_egress_gtpu_encap_0$action",
-      "table_type": "action",
-      "size": 1024,
-      "stage_tables": [
-        {
-          "stage_number": 1,
-          "size": 1024,
-          "stage_table_type": "action_data",
-          "logical_table_id": 5,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$constant10"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant11"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 45,
-                      "field_name": "$constant5"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 44,
-                      "field_name": "$constant6"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 43,
-                      "field_name": "$constant7"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 42,
-                      "field_name": "$constant8"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "$constant9"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 60,
-                      "field_name": "$constant12"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant13"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 6,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
-                      "lsb_mem_word_offset": 50,
-                      "field_name": "$constant14"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "$constant15"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 93,
-                      "field_name": "$constant16"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 13,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "$constant17"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$constant18"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant19"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "$constant20"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant21"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870957
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
-              "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777230,
-      "name": "tbl_act_13",
+      "handle": 16777228,
+      "name": "tbl_act_12",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -60258,7 +53042,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
+            "logical_table_id": 5,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -60273,13 +53057,13 @@
             "result_physical_buses": [ 4 ],
             "action_format": [
               {
-                "action_name": "act_13",
-                "action_handle": 536870958,
-                "table_name": "--END_OF_PIPELINE--",
+                "action_name": "act_12",
+                "action_handle": 536870925,
+                "table_name": "tbl_spgw_egress_gtpu_encap_0",
                 "next_table": 0,
-                "next_table_full": 255,
+                "next_table_full": 35,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 73,
+                "vliw_instruction_full": 68,
                 "immediate_fields": []
               }
             ],
@@ -60291,8 +53075,8 @@
       },
       "actions": [
         {
-          "name": "act_13",
-          "handle": 536870958,
+          "name": "act_12",
+          "handle": 536870925,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60314,21 +53098,21 @@
               "dst": { "type": "phv", "name": "packet_in.$valid" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B30" }
+                { "type": "phv", "name": "B26" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "packet_in.ingress_port" },
               "src": [
-                { "type": "phv", "name": "H27" },
-                { "type": "phv", "name": "H28" }
+                { "type": "phv", "name": "H26" },
+                { "type": "phv", "name": "H27" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870958,
+      "default_action_handle": 536870925,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60344,7 +53128,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777231,
+      "handle": 16777229,
       "name": "tbl_act_1",
       "table_type": "match",
       "size": 512,
@@ -60563,8 +53347,8 @@
               "action_format": [
                 {
                   "action_name": "act_4",
-                  "action_handle": 536870959,
-                  "table_name": "tbl_act_19",
+                  "action_handle": 536870926,
+                  "table_name": "tbl_act_17",
                   "next_table": 0,
                   "next_table_full": 33,
                   "vliw_instruction": 1,
@@ -60610,7 +53394,7 @@
       "actions": [
         {
           "name": "act_4",
-          "handle": 536870959,
+          "handle": 536870926,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60630,16 +53414,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870959,
+      "default_action_handle": 536870926,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60649,7 +53433,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777232,
+      "handle": 16777230,
       "name": "tbl_act_2",
       "table_type": "match",
       "size": 1,
@@ -60676,7 +53460,7 @@
             "action_format": [
               {
                 "action_name": "act_2",
-                "action_handle": 536870960,
+                "action_handle": 536870927,
                 "table_name": "spgw_ingress_ue_filter_table",
                 "next_table": 0,
                 "next_table_full": 34,
@@ -60694,7 +53478,7 @@
       "actions": [
         {
           "name": "act_2",
-          "handle": 536870960,
+          "handle": 536870927,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60724,12 +53508,12 @@
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [ { "type": "phv", "name": "H3" } ]
+              "src": [ { "type": "phv", "name": "H8" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ipv4.identification" },
-              "src": [ { "type": "phv", "name": "H9" } ]
+              "src": [ { "type": "phv", "name": "H6" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
@@ -60769,28 +53553,28 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H6" },
-              "src": [ { "type": "phv", "name": "H5" } ]
+              "dst": { "type": "phv", "name": "H3" },
+              "src": [ { "type": "phv", "name": "H2" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H8" },
-              "src": [ { "type": "phv", "name": "H7" } ]
+              "dst": { "type": "phv", "name": "H5" },
+              "src": [ { "type": "phv", "name": "H4" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W9" },
-              "src": [ { "type": "phv", "name": "W8" } ]
+              "dst": { "type": "phv", "name": "W12" },
+              "src": [ { "type": "phv", "name": "W11" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W11" },
-              "src": [ { "type": "phv", "name": "W10" } ]
+              "dst": { "type": "phv", "name": "W14" },
+              "src": [ { "type": "phv", "name": "W13" } ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870960,
+      "default_action_handle": 536870927,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60806,7 +53590,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777233,
+      "handle": 16777231,
       "name": "spgw_ingress.ue_filter_table",
       "table_type": "match",
       "size": 512,
@@ -61707,8 +54491,8 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870961,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870928,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -61729,7 +54513,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870961,
+          "handle": 536870928,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -61748,7 +54532,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870961,
+      "default_action_handle": 536870928,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -61769,8 +54553,1131 @@
       ]
     },
     {
+      "direction": "egress",
+      "handle": 16777232,
+      "name": "tbl_spgw_egress_gtpu_encap",
+      "table_type": "match",
+      "size": 512,
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 2,
+            "size": 512,
+            "stage_table_type": "ternary_match",
+            "logical_table_id": 3,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 47,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0,
+                "entries": [
+                  {
+                    "entry_number": 0,
+                    "fields": [
+                      {
+                        "field_name": "--tcam_payload_0--",
+                        "lsb_mem_word_offset": 0,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "payload",
+                        "start_bit": 0,
+                        "field_width": 1
+                      },
+                      {
+                        "field_name": "--tcam_parity_0--",
+                        "lsb_mem_word_offset": 45,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "parity",
+                        "start_bit": 0,
+                        "field_width": 2
+                      },
+                      {
+                        "field_name": "--unused--",
+                        "lsb_mem_word_offset": 1,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "zero",
+                        "start_bit": 0,
+                        "field_width": 41
+                      }
+                    ]
+                  }
+                ]
+              }
+            ],
+            "memory_resource_allocation": {
+              "memory_type": "tcam",
+              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
+              "spare_bank_memory_unit": 0
+            },
+            "result_physical_buses": [ 3 ],
+            "ternary_indirection_stage_table": {
+              "stage_number": 2,
+              "stage_table_type": "ternary_indirection",
+              "size": 512,
+              "pack_format": [
+                {
+                  "memory_word_width": 128,
+                  "table_word_width": 128,
+                  "entries_per_table_word": 16,
+                  "number_memory_units_per_table_word": 1,
+                  "entries": [
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 121,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 127,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 113,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 119,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 105,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 111,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 97,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 103,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 89,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 95,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 81,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 87,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 73,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 79,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 64,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 65,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 71,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 57,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 63,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 49,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 55,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 41,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 47,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 33,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 39,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 25,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 31,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 17,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 23,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 9,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 15,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 0,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 0,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 1,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 7,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
+              "action_format": [
+                {
+                  "action_name": "spgw_egress.gtpu_encap",
+                  "action_handle": 536870929,
+                  "table_name": "--END_OF_PIPELINE--",
+                  "next_table": 0,
+                  "next_table_full": 255,
+                  "vliw_instruction": 1,
+                  "vliw_instruction_full": 64,
+                  "immediate_fields": [
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 4,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 5,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 3,
+                      "dest_width": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        ],
+        "match_type": "ternary"
+      },
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554433,
+          "name": "tbl_spgw_egress_gtpu_encap_0$action"
+        }
+      ],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": [],
+      "actions": [
+        {
+          "name": "spgw_egress.gtpu_encap",
+          "handle": 536870929,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
+              "src": [
+                { "type": "action_param", "name": "$constant4" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
+              "src": [ { "immediate": "5395" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
+              "src": [ { "type": "phv", "name": "W25" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
+              "src": [ { "type": "phv", "name": "W23" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_udp.len" },
+              "src": [
+                { "type": "action_param", "name": "$constant3" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "src": [ { "type": "immediate", "name": "0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.msglen" },
+              "src": [ { "type": "phv", "name": "H21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.teid" },
+              "src": [ { "type": "phv", "name": "W21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B26" },
+              "src": [
+                { "type": "immediate", "name": "$data4" },
+                { "type": "phv", "name": "B26" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H29" },
+              "src": [ { "type": "action_param", "name": "$data0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H30" },
+              "src": [ { "type": "action_param", "name": "$data1" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W29" },
+              "src": [ { "type": "action_param", "name": "$data2" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W30" },
+              "src": [ { "type": "action_param", "name": "$data3" } ]
+            }
+          ]
+        }
+      ],
+      "default_action_handle": 536870929,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": []
+    },
+    {
+      "direction": "egress",
+      "handle": 33554433,
+      "name": "tbl_spgw_egress_gtpu_encap_0$action",
+      "table_type": "action",
+      "size": 1024,
+      "stage_tables": [
+        {
+          "stage_number": 2,
+          "size": 1024,
+          "stage_table_type": "action_data",
+          "logical_table_id": 3,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 1,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "$constant3"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "$constant4"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 40,
+                      "field_name": "$constant10"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "$constant11"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 3,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
+                      "lsb_mem_word_offset": 45,
+                      "field_name": "$constant5"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 44,
+                      "field_name": "$constant6"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 43,
+                      "field_name": "$constant7"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 42,
+                      "field_name": "$constant8"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 41,
+                      "field_name": "$constant9"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
+                      "lsb_mem_word_offset": 60,
+                      "field_name": "$constant12"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
+                      "lsb_mem_word_offset": 56,
+                      "field_name": "$constant13"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 6,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
+                      "lsb_mem_word_offset": 50,
+                      "field_name": "$constant14"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 2,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "$constant15"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 3,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
+                      "lsb_mem_word_offset": 93,
+                      "field_name": "$constant16"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 13,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "$constant17"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 72,
+                      "field_name": "$constant18"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "$constant19"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "$constant20"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "$constant21"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870929
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 90
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "spgw_egress.gtpu_encap",
+          "handle": 536870929,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
+              "src": [
+                { "type": "action_param", "name": "$constant4" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
+              "src": [ { "immediate": "5395" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
+              "src": [ { "type": "phv", "name": "W25" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
+              "src": [ { "type": "phv", "name": "W23" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_udp.len" },
+              "src": [
+                { "type": "action_param", "name": "$constant3" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "src": [ { "type": "immediate", "name": "0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.msglen" },
+              "src": [ { "type": "phv", "name": "H21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.teid" },
+              "src": [ { "type": "phv", "name": "W21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B26" },
+              "src": [
+                { "type": "immediate", "name": "$data4" },
+                { "type": "phv", "name": "B26" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H29" },
+              "src": [ { "type": "action_param", "name": "$data0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H30" },
+              "src": [ { "type": "action_param", "name": "$data1" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W29" },
+              "src": [ { "type": "action_param", "name": "$data2" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W30" },
+              "src": [ { "type": "action_param", "name": "$data3" } ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
       "direction": "ingress",
-      "handle": 16777234,
+      "handle": 16777233,
       "name": "spgw_ingress.s1u_filter_table",
       "table_type": "match",
       "size": 3072,
@@ -61779,7 +55686,7 @@
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
-      "default_action_handle": 536870962,
+      "default_action_handle": 536870930,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -64097,8 +58004,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870962,
-                "table_name": "tbl_act_22",
+                "action_handle": 536870930,
+                "table_name": "tbl_act_20",
                 "next_table": 0,
                 "next_table_full": 64,
                 "vliw_instruction": 0,
@@ -64492,7 +58399,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870962,
+          "handle": 536870930,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -64513,7 +58420,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777235,
+      "handle": 16777234,
       "name": "tbl_act_3",
       "table_type": "match",
       "size": 512,
@@ -64692,8 +58599,8 @@
               "action_format": [
                 {
                   "action_name": "act_1",
-                  "action_handle": 536870963,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870931,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -64739,7 +58646,7 @@
       "actions": [
         {
           "name": "act_1",
-          "handle": 536870963,
+          "handle": 536870931,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -64759,16 +58666,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870963,
+      "default_action_handle": 536870931,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -64778,7 +58685,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777236,
+      "handle": 16777235,
       "name": "tbl_act_4",
       "table_type": "match",
       "size": 512,
@@ -64957,8 +58864,8 @@
               "action_format": [
                 {
                   "action_name": "act_3",
-                  "action_handle": 536870964,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870932,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -65004,7 +58911,7 @@
       "actions": [
         {
           "name": "act_3",
-          "handle": 536870964,
+          "handle": 536870932,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -65024,16 +58931,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870964,
+      "default_action_handle": 536870932,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -65043,7 +58950,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777237,
+      "handle": 16777236,
       "name": "tbl_act_5",
       "table_type": "match",
       "size": 1,
@@ -65070,7 +58977,7 @@
             "action_format": [
               {
                 "action_name": "act_5",
-                "action_handle": 536870965,
+                "action_handle": 536870933,
                 "table_name": "cond-5",
                 "next_table": 0,
                 "next_table_full": 80,
@@ -65088,7 +58995,7 @@
       "actions": [
         {
           "name": "act_5",
-          "handle": 536870965,
+          "handle": 536870933,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -65110,13 +59017,13 @@
               "dst": { "type": "phv", "name": "spgw_ingress_hasReturned" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870965,
+      "default_action_handle": 536870933,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -65132,14 +59039,14 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777238,
+      "handle": 16777237,
       "name": "spgw_ingress.dl_sess_lookup",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554435,
+          "handle": 33554434,
           "name": "spgw_ingress_dl_sess_lookup$action"
         }
       ],
@@ -65147,7 +59054,7 @@
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
-      "default_action_handle": 536870967,
+      "default_action_handle": 536870935,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -67615,7 +61522,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870967,
+                "action_handle": 536870935,
                 "table_name": "tbl_spgw_ingress_drop_now_0",
                 "next_table": 0,
                 "next_table_full": 82,
@@ -67625,7 +61532,7 @@
               },
               {
                 "action_name": "spgw_ingress.set_dl_sess_info",
-                "action_handle": 536870966,
+                "action_handle": 536870934,
                 "table_name": "tbl_spgw_ingress_drop_now_0",
                 "next_table": 0,
                 "next_table_full": 82,
@@ -68028,7 +61935,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870967,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68047,7 +61954,7 @@
         },
         {
           "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68098,7 +62005,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554435,
+      "handle": 33554434,
       "name": "spgw_ingress_dl_sess_lookup$action",
       "table_type": "action",
       "size": 4096,
@@ -68145,7 +62052,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870967
+              "action_handle": 536870935
             },
             {
               "memory_word_width": 128,
@@ -68200,7 +62107,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870966
+              "action_handle": 536870934
             }
           ],
           "memory_resource_allocation": {
@@ -68216,7 +62123,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870967,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68235,7 +62142,7 @@
         },
         {
           "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68287,7 +62194,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777239,
+      "handle": 16777238,
       "name": "tbl_spgw_ingress_drop_now",
       "table_type": "match",
       "size": 1,
@@ -68314,7 +62221,7 @@
             "action_format": [
               {
                 "action_name": "spgw_ingress.drop_now",
-                "action_handle": 536870968,
+                "action_handle": 536870936,
                 "table_name": "spgw_ingress_ue_cdr_table",
                 "next_table": 0,
                 "next_table_full": 96,
@@ -68332,7 +62239,7 @@
       "actions": [
         {
           "name": "spgw_ingress.drop_now",
-          "handle": 536870968,
+          "handle": 536870936,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68362,13 +62269,13 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870968,
+      "default_action_handle": 536870936,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -68384,7 +62291,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777240,
+      "handle": 16777239,
       "name": "spgw_ingress.ue_cdr_table",
       "table_type": "match",
       "size": 3072,
@@ -68399,7 +62306,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870970,
+      "default_action_handle": 536870938,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -70723,8 +64630,8 @@
             "action_format": [
               {
                 "action_name": "spgw_ingress.update_ue_cdr",
-                "action_handle": 536870969,
-                "table_name": "tbl_act_23",
+                "action_handle": 536870937,
+                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
                 "next_table": 0,
                 "next_table_full": 97,
                 "vliw_instruction": 0,
@@ -70733,8 +64640,8 @@
               },
               {
                 "action_name": "NoAction",
-                "action_handle": 536870970,
-                "table_name": "tbl_act_23",
+                "action_handle": 536870938,
+                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
                 "next_table": 0,
                 "next_table_full": 97,
                 "vliw_instruction": 0,
@@ -71161,7 +65068,7 @@
       "actions": [
         {
           "name": "spgw_ingress.update_ue_cdr",
-          "handle": 536870969,
+          "handle": 536870937,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -71180,7 +65087,7 @@
         },
         {
           "name": "NoAction",
-          "handle": 536870970,
+          "handle": 536870938,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -71241,93 +65148,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777241,
-      "name": "tbl_act_6",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_6",
-                "action_handle": 536870971,
-                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
-                "next_table": 0,
-                "next_table_full": 98,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_6",
-          "handle": 536870971,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.ipv4_len" },
-              "src": [ { "type": "phv", "name": "H4" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870971,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777242,
+      "handle": 16777240,
       "name": "tbl_spgw_ingress_gtpu_decap",
       "table_type": "match",
       "size": 512,
@@ -71337,8 +65158,8 @@
             "stage_number": 6,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
-            "default_next_table": 3,
+            "logical_table_id": 1,
+            "default_next_table": 2,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -71387,7 +65208,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 3 ],
+            "result_physical_buses": [ 2 ],
             "ternary_indirection_stage_table": {
               "stage_number": 6,
               "stage_table_type": "ternary_indirection",
@@ -72206,12 +66027,12 @@
               "action_format": [
                 {
                   "action_name": "spgw_ingress.gtpu_decap",
-                  "action_handle": 536870972,
+                  "action_handle": 536870939,
                   "table_name": "filtering_ingress_port_vlan",
                   "next_table": 0,
-                  "next_table_full": 99,
+                  "next_table_full": 98,
                   "vliw_instruction": 1,
-                  "vliw_instruction_full": 66,
+                  "vliw_instruction_full": 65,
                   "immediate_fields": [
                     {
                       "param_name": "constant_0",
@@ -72245,7 +66066,7 @@
       "actions": [
         {
           "name": "spgw_ingress.gtpu_decap",
-          "handle": 536870972,
+          "handle": 536870939,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -72281,7 +66102,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870972,
+      "default_action_handle": 536870939,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -72291,7 +66112,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777243,
+      "handle": 16777241,
       "name": "filtering.ingress_port_vlan",
       "table_type": "match",
       "size": 512,
@@ -72301,8 +66122,8 @@
             "stage_number": 6,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 3,
-            "default_next_table": 4,
+            "logical_table_id": 2,
+            "default_next_table": 3,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -73228,42 +67049,42 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870975,
+                  "action_handle": 536870942,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 0,
                   "vliw_instruction_full": 64,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.push_internal_vlan",
-                  "action_handle": 536870973,
+                  "action_handle": 536870940,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 1,
-                  "vliw_instruction_full": 67,
+                  "vliw_instruction_full": 66,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.set_vlan",
-                  "action_handle": 536870974,
+                  "action_handle": 536870941,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 2,
                   "vliw_instruction_full": 68,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.drop",
-                  "action_handle": 536870976,
+                  "action_handle": 536870943,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 3,
-                  "vliw_instruction_full": 69,
+                  "vliw_instruction_full": 67,
                   "immediate_fields": []
                 }
               ]
@@ -73275,7 +67096,7 @@
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554436,
+          "handle": 33554435,
           "name": "filtering_ingress_port_vlan$action"
         }
       ],
@@ -73292,7 +67113,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870975,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -73311,7 +67132,7 @@
         },
         {
           "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73347,7 +67168,7 @@
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -73355,22 +67176,22 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
+              "dst": { "type": "phv", "name": "W10" },
               "src": [
                 { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             }
           ]
         },
         {
           "name": "filtering.set_vlan",
-          "handle": 536870974,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73398,14 +67219,14 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             }
           ]
         },
         {
           "name": "filtering.drop",
-          "handle": 536870976,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73432,7 +67253,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870975,
+      "default_action_handle": 536870942,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -73485,7 +67306,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 3,
+          "logical_table_id": 2,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -73515,7 +67336,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554436,
+      "handle": 33554435,
       "name": "filtering_ingress_port_vlan$action",
       "table_type": "action",
       "size": 2048,
@@ -73524,7 +67345,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "action_data",
-          "logical_table_id": 3,
+          "logical_table_id": 2,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -73562,7 +67383,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870975
+              "action_handle": 536870942
             },
             {
               "memory_word_width": 128,
@@ -73677,7 +67498,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870973
+              "action_handle": 536870940
             },
             {
               "memory_word_width": 128,
@@ -73750,7 +67571,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870974
+              "action_handle": 536870941
             },
             {
               "memory_word_width": 128,
@@ -73787,7 +67608,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870976
+              "action_handle": 536870943
             }
           ],
           "memory_resource_allocation": {
@@ -73800,7 +67621,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870975,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -73819,7 +67640,7 @@
         },
         {
           "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73855,7 +67676,7 @@
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -73863,22 +67684,22 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
+              "dst": { "type": "phv", "name": "W10" },
               "src": [
                 { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             }
           ]
         },
         {
           "name": "filtering.set_vlan",
-          "handle": 536870974,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73906,14 +67727,14 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             }
           ]
         },
         {
           "name": "filtering.drop",
-          "handle": 536870976,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73944,7 +67765,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777244,
+      "handle": 16777242,
       "name": "filtering.fwd_classifier",
       "table_type": "match",
       "size": 3072,
@@ -73959,7 +67780,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870977,
+      "default_action_handle": 536870944,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -74006,8 +67827,8 @@
             "stage_number": 6,
             "size": 3072,
             "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 101,
+            "logical_table_id": 3,
+            "default_next_table": 100,
             "has_attached_gateway": false,
             "hash_functions": [
               {
@@ -79779,12 +73600,12 @@
             "action_format": [
               {
                 "action_name": "filtering.set_forwarding_type",
-                "action_handle": 536870977,
-                "table_name": "tbl_act_29",
+                "action_handle": 536870944,
+                "table_name": "tbl_act_26",
                 "next_table": 0,
-                "next_table_full": 101,
+                "next_table_full": 100,
                 "vliw_instruction": 0,
-                "vliw_instruction_full": 70,
+                "vliw_instruction_full": 69,
                 "immediate_fields": [
                   {
                     "param_name": "fwd_type",
@@ -80395,7 +74216,7 @@
       "actions": [
         {
           "name": "filtering.set_forwarding_type",
-          "handle": 536870977,
+          "handle": 536870944,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80424,7 +74245,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.fwd_type" },
               "src": [
                 { "type": "immediate", "name": "fwd_type" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
@@ -80442,7 +74263,7 @@
           "stage_number": 6,
           "size": 4096,
           "stage_table_type": "statistics",
-          "logical_table_id": 4,
+          "logical_table_id": 3,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -80473,8 +74294,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777245,
-      "name": "tbl_act_12",
+      "handle": 16777243,
+      "name": "tbl_act_11",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -80484,7 +74305,7 @@
             "stage_number": 6,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 5,
+            "logical_table_id": 4,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -80499,11 +74320,11 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_12",
-                "action_handle": 536870978,
-                "table_name": "tbl_act_27",
+                "action_name": "act_11",
+                "action_handle": 536870945,
+                "table_name": "tbl_act_24",
                 "next_table": 0,
-                "next_table_full": 102,
+                "next_table_full": 101,
                 "vliw_instruction": 0,
                 "vliw_instruction_full": 64,
                 "immediate_fields": []
@@ -80517,8 +74338,8 @@
       },
       "actions": [
         {
-          "name": "act_12",
-          "handle": 536870978,
+          "name": "act_11",
+          "handle": 536870945,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80537,7 +74358,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870978,
+      "default_action_handle": 536870945,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -80553,8 +74374,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777246,
-      "name": "tbl_act_10",
+      "handle": 16777244,
+      "name": "tbl_act_9",
       "table_type": "match",
       "size": 512,
       "preferred_match_type": "exact",
@@ -80564,7 +74385,7 @@
             "stage_number": 6,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
+            "logical_table_id": 5,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -80576,11 +74397,11 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
-                "action_name": "act_10",
-                "action_handle": 536870979,
+                "action_name": "act_9",
+                "action_handle": 536870946,
                 "table_name": "forwarding_bridging",
                 "next_table": 0,
                 "next_table_full": 112,
@@ -80597,8 +74418,8 @@
       },
       "actions": [
         {
-          "name": "act_10",
-          "handle": 536870979,
+          "name": "act_9",
+          "handle": 536870946,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80617,7 +74438,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870979,
+      "default_action_handle": 536870946,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -80648,7 +74469,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 6,
+          "logical_table_id": 5,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -80678,7 +74499,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777247,
+      "handle": 16777245,
       "name": "forwarding.bridging",
       "table_type": "match",
       "size": 512,
@@ -80805,16 +74626,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 7,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -80829,22 +75025,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -80864,22 +75425,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -80894,7 +75445,7 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870981,
+                  "action_handle": 536870948,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -80904,21 +75455,13 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870980,
+                  "action_handle": 536870947,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 }
               ]
             }
@@ -80926,7 +75469,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554436,
+          "name": "forwarding_bridging$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -80940,7 +75489,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870981,
+          "handle": 536870948,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80955,12 +75504,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870980,
+          "handle": 536870947,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80982,17 +75530,24 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870981,
+      "default_action_handle": 536870948,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -81064,11 +75619,230 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777248,
+      "handle": 33554436,
+      "name": "forwarding_bridging$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 0,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870948
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870947
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 81 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 81
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870948,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870947,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777246,
       "name": "forwarding.mpls",
       "table_type": "match",
       "size": 3072,
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554437,
+          "name": "forwarding_mpls$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -81079,7 +75853,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870983,
+      "default_action_handle": 536870950,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -82479,8 +77253,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870983,
-                "table_name": "tbl_act_24",
+                "action_handle": 536870950,
+                "table_name": "tbl_act_21",
                 "next_table": 0,
                 "next_table_full": 114,
                 "vliw_instruction": 0,
@@ -82489,8 +77263,8 @@
               },
               {
                 "action_name": "forwarding.pop_mpls_and_next",
-                "action_handle": 536870982,
-                "table_name": "tbl_act_24",
+                "action_handle": 536870949,
+                "table_name": "tbl_act_21",
                 "next_table": 0,
                 "next_table_full": 114,
                 "vliw_instruction": 1,
@@ -82500,8 +77274,8 @@
                     "param_name": "next_id",
                     "param_type": "parameter",
                     "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 32
+                    "dest_start": 16,
+                    "dest_width": 16
                   }
                 ]
               }
@@ -82889,10 +77663,11 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870983,
+          "handle": 536870950,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
           "p4_parameters": [],
           "override_meter_addr": false,
           "override_meter_addr_pfe": false,
@@ -82903,15 +77678,15 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.pop_mpls_and_next",
-          "handle": 536870982,
+          "handle": 536870949,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
           "p4_parameters": [
             {
               "name": "next_id",
@@ -82929,7 +77704,6 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
@@ -82941,8 +77715,16 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "immediate", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
@@ -82990,8 +77772,343 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777249,
-      "name": "tbl_act_7",
+      "handle": 33554437,
+      "name": "forwarding_mpls$action",
+      "table_type": "action",
+      "size": 8192,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 8192,
+          "stage_table_type": "action_data",
+          "logical_table_id": 1,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 8,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 7,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 6,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 5,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 4,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 3,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 2,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870950
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 8,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 7,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 6,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 5,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 4,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 3,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 2,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "next_id"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870949
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 88
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870950,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.pop_mpls_and_next",
+          "handle": 536870949,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "mpls.$valid" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "B8" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "immediate", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777247,
+      "name": "tbl_act_6",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -83188,8 +78305,8 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "act_7",
-                  "action_handle": 536870984,
+                  "action_name": "act_6",
+                  "action_handle": 536870951,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -83215,8 +78332,8 @@
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554437,
-          "name": "tbl_act_24$action"
+          "handle": 33554438,
+          "name": "tbl_act_21$action"
         }
       ],
       "selection_table_refs": [],
@@ -83225,8 +78342,8 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "act_7",
-          "handle": 536870984,
+          "name": "act_6",
+          "handle": 536870951,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83247,7 +78364,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -83255,13 +78372,13 @@
               "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
+                { "type": "phv", "name": "W35" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870984,
+      "default_action_handle": 536870951,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -83271,8 +78388,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554437,
-      "name": "tbl_act_24$action",
+      "handle": 33554438,
+      "name": "tbl_act_21$action",
       "table_type": "action",
       "size": 4096,
       "stage_tables": [
@@ -83386,7 +78503,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870984
+              "action_handle": 536870951
             }
           ],
           "memory_resource_allocation": {
@@ -83398,8 +78515,8 @@
       ],
       "actions": [
         {
-          "name": "act_7",
-          "handle": 536870984,
+          "name": "act_6",
+          "handle": 536870951,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83420,7 +78537,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -83428,7 +78545,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
+                { "type": "phv", "name": "W35" }
               ]
             }
           ]
@@ -83438,7 +78555,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777250,
+      "handle": 16777248,
       "name": "forwarding.unicast_v4",
       "table_type": "match",
       "size": 512,
@@ -83583,16 +78700,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 7,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -83607,22 +79099,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -83642,22 +79499,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -83672,7 +79519,7 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870986,
+                  "action_handle": 536870953,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -83682,21 +79529,13 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870985,
+                  "action_handle": 536870952,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 68,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 }
               ]
             }
@@ -83704,7 +79543,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554439,
+          "name": "forwarding_unicast_v4$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -83718,7 +79563,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870986,
+          "handle": 536870953,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83733,12 +79578,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870985,
+          "handle": 536870952,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83760,17 +79604,24 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870986,
+      "default_action_handle": 536870953,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -83831,7 +79682,220 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777251,
+      "handle": 33554439,
+      "name": "forwarding_unicast_v4$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 3,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870953
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870952
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 75 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 75
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870953,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870952,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777249,
       "name": "forwarding.acl",
       "table_type": "match",
       "size": 256,
@@ -83999,7 +80063,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.l4_dst_port",
+                        "field_name": "fabric_metadata.original_ether_type",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 5,
                         "msb_mem_word_idx": 5,
@@ -84026,7 +80090,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.original_ether_type",
+                        "field_name": "ipv4.dst_addr",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -84053,7 +80117,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.dst_addr",
+                        "field_name": "ipv4.src_addr",
                         "lsb_mem_word_offset": 9,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -84062,7 +80126,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.l4_dst_port",
+                        "field_name": "fabric_metadata.original_ether_type",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -84089,7 +80153,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.original_ether_type",
+                        "field_name": "ipv4.dst_addr",
                         "lsb_mem_word_offset": 1,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84116,7 +80180,7 @@
                         "field_width": 4
                       },
                       {
-                        "field_name": "ipv4.src_addr",
+                        "field_name": "standard_metadata.ingress_port",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84125,7 +80189,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.dst_addr",
+                        "field_name": "ipv4.src_addr",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84152,7 +80216,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "standard_metadata.ingress_port",
+                        "field_name": "ethernet.dst_addr",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84161,7 +80225,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.src_addr",
+                        "field_name": "fabric_metadata.l4_dst_port",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84170,7 +80234,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ethernet.dst_addr",
+                        "field_name": "fabric_metadata.l4_dst_port",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84282,16 +80346,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 8,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -84306,22 +80745,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -84341,22 +81145,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -84371,7 +81165,7 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870990,
+                  "action_handle": 536870957,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
@@ -84381,44 +81175,27 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870987,
+                  "action_handle": 536870954,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 },
                 {
                   "action_name": "forwarding.duplicate_to_controller",
-                  "action_handle": 536870988,
+                  "action_handle": 536870955,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
                   "vliw_instruction": 2,
                   "vliw_instruction_full": 65,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_320",
-                      "param_type": "constant",
-                      "const_value": 320,
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 9
-                    }
-                  ]
+                  "immediate_fields": []
                 },
                 {
                   "action_name": "forwarding.drop",
-                  "action_handle": 536870989,
+                  "action_handle": 536870956,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
@@ -84432,7 +81209,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554440,
+          "name": "forwarding_acl$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -84446,7 +81229,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870990,
+          "handle": 536870957,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -84461,12 +81244,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870987,
+          "handle": 536870954,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84488,18 +81270,25 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         },
         {
           "name": "forwarding.duplicate_to_controller",
-          "handle": 536870988,
+          "handle": 536870955,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84514,13 +81303,12 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
-                { "type": "immediate", "name": "$constant0" },
+                { "type": "action_param", "name": "$constant0" },
                 { "type": "phv", "name": "H1" }
               ]
             }
@@ -84528,7 +81316,7 @@
         },
         {
           "name": "forwarding.drop",
-          "handle": 536870989,
+          "handle": 536870956,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84543,7 +81331,6 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
@@ -84556,7 +81343,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870990,
+      "default_action_handle": 536870957,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -84738,14 +81525,395 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777252,
+      "handle": 33554440,
+      "name": "forwarding_acl$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 8,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 0,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870957
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870954
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 320, "dest_width": 9 } ],
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "$constant0"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 39,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 89,
+                      "field_name": "--padding_25_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 320, "dest_width": 9 } ],
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "$constant0"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 39,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 25,
+                      "field_name": "--padding_25_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870955
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870956
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 90
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "nop",
+          "handle": 536870957,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870954,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "forwarding.duplicate_to_controller",
+          "handle": 536870955,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
+              "src": [
+                { "type": "action_param", "name": "$constant0" },
+                { "type": "phv", "name": "H1" }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "forwarding.drop",
+          "handle": 536870956,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "ig_intr_md_for_dprs.drop_ctl" },
+              "src": [
+                { "type": "immediate", "name": "1" },
+                { "type": "phv", "name": "B2" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777250,
       "name": "next.simple",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554438,
+          "handle": 33554441,
           "name": "next_simple$action"
         }
       ],
@@ -84759,7 +81927,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870995,
+      "default_action_handle": 536870962,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -84795,6 +81963,54 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 0,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -84817,54 +82033,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -84873,13 +82041,55 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -84895,48 +82105,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -84945,49 +82113,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -84999,19 +82155,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
+                        "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85021,6 +82165,30 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85029,31 +82197,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85065,7 +82209,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85077,7 +82221,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85089,31 +82257,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85125,7 +82269,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85137,40 +82281,64 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 4,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85179,36 +82347,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85221,13 +82359,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85245,19 +82383,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85269,60 +82437,24 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85335,13 +82467,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85353,37 +82521,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85401,19 +82539,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85425,42 +82593,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85473,7 +82605,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85491,7 +82635,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85503,13 +82653,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85521,67 +82689,67 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85593,37 +82761,19 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 0,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85635,24 +82785,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85665,13 +82797,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85683,42 +82851,18 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85731,13 +82875,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85747,6 +82897,24 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85755,37 +82923,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85803,13 +82941,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85825,6 +82957,42 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85833,13 +83001,67 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 3,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 14,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85857,7 +83079,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85885,21 +83125,9 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85911,13 +83139,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 15,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 17,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85953,6 +83187,264 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 16,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 17,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 18,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85971,7 +83463,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85979,17 +83495,155 @@
                     ]
                   },
                   {
-                    "hash_bit": 15,
+                    "hash_bit": 19,
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 5,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 20,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86017,14 +83671,98 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 21,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 22,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86043,6 +83781,18 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86061,540 +83811,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
                         "field_bit": 2,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86607,13 +83823,229 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 23,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 24,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 4,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 25,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 26,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86631,66 +84063,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86703,66 +84075,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86775,107 +84087,35 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
                       {
                         "field_bit": 6,
                         "field_name": "fabric_metadata.next_id",
@@ -86883,18 +84123,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86907,13 +84135,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 14,
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 27,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86937,7 +84171,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86949,19 +84183,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86971,13 +84193,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 7,
                         "field_name": "fabric_metadata.next_id",
@@ -86985,43 +84201,43 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 28,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
+                        "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -87049,13 +84265,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
@@ -87069,12 +84279,24 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 16,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 29,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -87099,6 +84321,18 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -87111,7 +84345,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -87121,13 +84355,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
@@ -87157,66 +84385,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   }
@@ -87227,7 +84395,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870995,
+                "action_handle": 536870962,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87237,7 +84405,7 @@
               },
               {
                 "action_name": "next.output",
-                "action_handle": 536870991,
+                "action_handle": 536870958,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87247,7 +84415,7 @@
               },
               {
                 "action_name": "next.set_vlan_output",
-                "action_handle": 536870992,
+                "action_handle": 536870959,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87257,7 +84425,7 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870993,
+                "action_handle": 536870960,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87267,7 +84435,7 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870994,
+                "action_handle": 536870961,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87695,7 +84863,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870995,
+          "handle": 536870962,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87714,7 +84882,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870991,
+          "handle": 536870958,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87749,7 +84917,7 @@
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870992,
+          "handle": 536870959,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87783,7 +84951,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -87791,7 +84959,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
@@ -87806,7 +84974,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870993,
+          "handle": 536870960,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87849,7 +85017,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -87866,7 +85034,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870994,
+          "handle": 536870961,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87918,7 +85086,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -87931,7 +85099,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -87946,7 +85114,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -87995,7 +85163,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554438,
+      "handle": 33554441,
       "name": "next_simple$action",
       "table_type": "action",
       "size": 3072,
@@ -88028,7 +85196,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870995
+              "action_handle": 536870962
             },
             {
               "memory_word_width": 128,
@@ -88069,7 +85237,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870991
+              "action_handle": 536870958
             },
             {
               "memory_word_width": 128,
@@ -88128,7 +85296,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870992
+              "action_handle": 536870959
             },
             {
               "memory_word_width": 128,
@@ -88205,7 +85373,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870993
+              "action_handle": 536870960
             },
             {
               "memory_word_width": 128,
@@ -88340,7 +85508,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870994
+              "action_handle": 536870961
             }
           ],
           "memory_resource_allocation": {
@@ -88357,7 +85525,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870995,
+          "handle": 536870962,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88376,7 +85544,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870991,
+          "handle": 536870958,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88411,7 +85579,7 @@
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870992,
+          "handle": 536870959,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88445,7 +85613,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -88453,7 +85621,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
@@ -88468,7 +85636,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870993,
+          "handle": 536870960,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88511,7 +85679,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -88528,7 +85696,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870994,
+          "handle": 536870961,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88580,7 +85748,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -88593,7 +85761,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -88608,7 +85776,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -88618,8 +85786,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777253,
-      "name": "tbl_act_8",
+      "handle": 16777251,
+      "name": "tbl_act_7",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -88644,8 +85812,8 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_8",
-                "action_handle": 536870996,
+                "action_name": "act_7",
+                "action_handle": 536870963,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -88662,8 +85830,8 @@
       },
       "actions": [
         {
-          "name": "act_8",
-          "handle": 536870996,
+          "name": "act_7",
+          "handle": 536870963,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88692,7 +85860,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870996,
+      "default_action_handle": 536870963,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -88708,14 +85876,14 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777254,
+      "handle": 16777252,
       "name": "next.hashed",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "indirect",
-          "handle": 33554439,
+          "handle": 33554442,
           "name": "next.ecmp_selector"
         }
       ],
@@ -88737,7 +85905,7 @@
       "stateful_table_refs": [],
       "default_selector_mask": 0,
       "default_selector_value": 0,
-      "default_action_handle": 536871000,
+      "default_action_handle": 536870967,
       "action_profile": "next.ecmp_selector",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -88773,6 +85941,30 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -88785,13 +85977,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88809,37 +86001,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88851,19 +86019,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 19,
+                        "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88875,43 +86061,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
+                        "field_bit": 29,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88923,54 +86091,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 2,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -88983,7 +86103,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88993,6 +86113,54 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89001,72 +86169,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 3,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89103,7 +86205,73 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89115,13 +86283,31 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 17,
+                        "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89139,7 +86325,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89161,36 +86359,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89199,61 +86367,13 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 5,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89265,7 +86385,55 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89277,54 +86445,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 6,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89343,22 +86463,70 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89367,19 +86535,49 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 17,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89397,7 +86595,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89407,36 +86605,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89445,42 +86613,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89493,7 +86625,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89505,7 +86637,43 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89517,19 +86685,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 18,
+                        "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89545,24 +86731,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89571,6 +86739,36 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89583,7 +86781,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89595,12 +86799,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89619,7 +86817,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89635,36 +86833,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89673,48 +86841,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89727,7 +86853,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89743,96 +86869,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 20,
@@ -89847,90 +86883,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89943,6 +86895,90 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 12,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89953,8 +86989,92 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 13,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 14,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89967,13 +87087,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89983,21 +87097,9 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90009,13 +87111,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90027,66 +87123,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90099,7 +87135,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 6,
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 15,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 5,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90111,7 +87171,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90127,13 +87187,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
@@ -90147,6 +87201,150 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 16,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 17,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90165,156 +87363,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90331,13 +87379,91 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 18,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 19,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
                         "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
@@ -90351,7 +87477,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90361,18 +87487,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 17,
@@ -90387,12 +87501,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90411,13 +87519,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90427,7 +87529,13 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 20,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
                         "field_bit": 0,
                         "field_name": "fabric_metadata.next_id",
@@ -90441,67 +87549,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90513,18 +87561,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90537,144 +87573,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90687,13 +87585,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90711,7 +87609,67 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 21,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90723,6 +87681,162 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 22,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 23,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 24,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90735,222 +87849,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90967,13 +87865,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
@@ -90987,13 +87879,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91005,25 +87909,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
+                        "field_bit": 29,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91031,10 +87917,22 @@
                     ]
                   },
                   {
-                    "hash_bit": 29,
+                    "hash_bit": 25,
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -91047,13 +87945,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91071,13 +87975,37 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 9,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 26,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91095,7 +88023,247 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 27,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 28,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 29,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91109,8 +88277,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536871000,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870967,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 0,
@@ -91119,8 +88287,8 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870997,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870964,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 1,
@@ -91129,8 +88297,8 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870998,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870965,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 2,
@@ -91139,8 +88307,8 @@
               },
               {
                 "action_name": "next.mpls_routing_v6",
-                "action_handle": 536870999,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870966,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 3,
@@ -91633,7 +88801,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536871000,
+          "handle": 536870967,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91652,7 +88820,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870997,
+          "handle": 536870964,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91695,7 +88863,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91712,7 +88880,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870998,
+          "handle": 536870965,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91764,7 +88932,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -91777,7 +88945,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91792,14 +88960,14 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870999,
+          "handle": 536870966,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91851,7 +89019,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -91864,7 +89032,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91879,7 +89047,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -91895,7 +89063,7 @@
       "selection_type": "fair",
       "how_referenced": "indirect",
       "max_port_pool_size": 120,
-      "bound_to_action_data_table_handle": 33554439,
+      "bound_to_action_data_table_handle": 33554442,
       "stage_tables": [
         {
           "stage_number": 10,
@@ -91922,7 +89090,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554439,
+      "handle": 33554442,
       "name": "next.ecmp_selector",
       "table_type": "action",
       "size": 64,
@@ -91955,7 +89123,7 @@
                   ]
                 }
               ],
-              "action_handle": 536871000
+              "action_handle": 536870967
             },
             {
               "memory_word_width": 128,
@@ -92032,7 +89200,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870997
+              "action_handle": 536870964
             },
             {
               "memory_word_width": 128,
@@ -92167,7 +89335,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870998
+              "action_handle": 536870965
             },
             {
               "memory_word_width": 128,
@@ -92302,7 +89470,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870999
+              "action_handle": 536870966
             }
           ],
           "memory_resource_allocation": {
@@ -92315,7 +89483,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536871000,
+          "handle": 536870967,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92334,7 +89502,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870997,
+          "handle": 536870964,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92377,7 +89545,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92394,7 +89562,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870998,
+          "handle": 536870965,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92446,7 +89614,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -92459,7 +89627,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92474,14 +89642,14 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870999,
+          "handle": 536870966,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92533,7 +89701,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -92546,7 +89714,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92561,7 +89729,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -92611,8 +89779,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777255,
-      "name": "tbl_act_11",
+      "handle": 16777253,
+      "name": "tbl_act_10",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -92637,9 +89805,9 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_11",
-                "action_handle": 536871001,
-                "table_name": "tbl_act_26",
+                "action_name": "act_10",
+                "action_handle": 536870968,
+                "table_name": "tbl_act_23",
                 "next_table": 0,
                 "next_table_full": 177,
                 "vliw_instruction": 1,
@@ -92655,8 +89823,8 @@
       },
       "actions": [
         {
-          "name": "act_11",
-          "handle": 536871001,
+          "name": "act_10",
+          "handle": 536870968,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92677,8 +89845,8 @@
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
-                { "type": "phv", "name": "W7" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W10" },
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92692,7 +89860,7 @@
           ]
         }
       ],
-      "default_action_handle": 536871001,
+      "default_action_handle": 536870968,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -92708,8 +89876,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777256,
-      "name": "tbl_act_9",
+      "handle": 16777254,
+      "name": "tbl_act_8",
       "table_type": "match",
       "size": 512,
       "preferred_match_type": "exact",
@@ -92734,8 +89902,8 @@
             "result_physical_buses": [ 1 ],
             "action_format": [
               {
-                "action_name": "act_9",
-                "action_handle": 536871002,
+                "action_name": "act_8",
+                "action_handle": 536870969,
                 "table_name": "--END_OF_PIPELINE--",
                 "next_table": 0,
                 "next_table_full": 255,
@@ -92752,8 +89920,8 @@
       },
       "actions": [
         {
-          "name": "act_9",
-          "handle": 536871002,
+          "name": "act_8",
+          "handle": 536870969,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92772,7 +89940,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536871002,
+      "default_action_handle": 536870969,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -92861,27 +90029,17 @@
     {
       "fully_qualified_name": "mau[0].dp.match_input_xbar_din_power_ctl",
       "name": "stage_0_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000001800000022000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[0].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_0_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000001800000008000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[1].dp.match_input_xbar_din_power_ctl",
       "name": "stage_1_match_input_xbar_din_power_ctl",
-      "value": "00000000000000000000000000000000000000800000000000000000000000de000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[1].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_1_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000080000000000000000000000018000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[2].dp.match_input_xbar_din_power_ctl",
       "name": "stage_2_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000000000000000000000000000040000000000000000000000003000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[3].dp.match_input_xbar_din_power_ctl",
@@ -92896,12 +90054,12 @@
     {
       "fully_qualified_name": "mau[4].dp.match_input_xbar_din_power_ctl",
       "name": "stage_4_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[5].dp.match_input_xbar_din_power_ctl",
       "name": "stage_5_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[5].dp.xbar_hash.hash.parity_group_mask",
@@ -92911,7 +90069,7 @@
     {
       "fully_qualified_name": "mau[6].dp.match_input_xbar_din_power_ctl",
       "name": "stage_6_match_input_xbar_din_power_ctl",
-      "value": "0000009000000040000000000000000000000000000000010000000000000000000000000000003800000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000004000000000000000000000000000000010000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[6].dp.xbar_hash.hash.parity_group_mask",
@@ -92921,7 +90079,7 @@
     {
       "fully_qualified_name": "mau[7].dp.match_input_xbar_din_power_ctl",
       "name": "stage_7_match_input_xbar_din_power_ctl",
-      "value": "0000009000000060000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[7].dp.xbar_hash.hash.parity_group_mask",
@@ -92931,12 +90089,12 @@
     {
       "fully_qualified_name": "mau[8].dp.match_input_xbar_din_power_ctl",
       "name": "stage_8_match_input_xbar_din_power_ctl",
-      "value": "000000d2000000c000000000000000000000002000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "000000120000000600000000000000000000002000000000000000000000000000000000000000b80000000000000000000000000000000100000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[9].dp.match_input_xbar_din_power_ctl",
       "name": "stage_9_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000008000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[9].dp.xbar_hash.hash.parity_group_mask",
@@ -92946,7 +90104,7 @@
     {
       "fully_qualified_name": "mau[10].dp.match_input_xbar_din_power_ctl",
       "name": "stage_10_match_input_xbar_din_power_ctl",
-      "value": "0000001200000000000000000000000000000060000000010000000000000000000000000000008000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "000000920000000000000000000000000000006000000001000000000000000000000000000000c000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[10].dp.xbar_hash.hash.parity_group_mask",
@@ -92956,7 +90114,7 @@
     {
       "fully_qualified_name": "mau[11].dp.match_input_xbar_din_power_ctl",
       "name": "stage_11_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[11].dp.xbar_hash.hash.parity_group_mask",
@@ -92964,4 +90122,4 @@
       "value": "00000001000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/fabric.p4info
old mode 100644
new mode 100755
similarity index 67%
rename from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/fabric.p4info
index cddc88a..3b4f3d5
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/fabric.p4info
@@ -372,145 +372,6 @@
   direct_resource_ids: 302023316
   size: 1024
 }
-tables {
-  preamble {
-    id: 33583029
-    name: "int_egress.int_metadata_insert.int_inst_0003"
-    alias: "int_inst_0003"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0003"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16831286
-  }
-  action_refs {
-    id: 16842664
-  }
-  action_refs {
-    id: 16816733
-  }
-  action_refs {
-    id: 16819517
-  }
-  action_refs {
-    id: 16794056
-  }
-  action_refs {
-    id: 16804966
-  }
-  action_refs {
-    id: 16779523
-  }
-  action_refs {
-    id: 16794789
-  }
-  action_refs {
-    id: 16834584
-  }
-  action_refs {
-    id: 16780654
-  }
-  action_refs {
-    id: 16841202
-  }
-  action_refs {
-    id: 16800429
-  }
-  action_refs {
-    id: 16842176
-  }
-  action_refs {
-    id: 16810248
-  }
-  action_refs {
-    id: 16786933
-  }
-  action_refs {
-    id: 16828419
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33570208
-    name: "int_egress.int_metadata_insert.int_inst_0407"
-    alias: "int_inst_0407"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0407"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16794499
-  }
-  action_refs {
-    id: 16785636
-  }
-  action_refs {
-    id: 16819629
-  }
-  action_refs {
-    id: 16816181
-  }
-  action_refs {
-    id: 16809168
-  }
-  action_refs {
-    id: 16798574
-  }
-  action_refs {
-    id: 16783327
-  }
-  action_refs {
-    id: 16796243
-  }
-  action_refs {
-    id: 16787702
-  }
-  action_refs {
-    id: 16778104
-  }
-  action_refs {
-    id: 16794531
-  }
-  action_refs {
-    id: 16805663
-  }
-  action_refs {
-    id: 16809122
-  }
-  action_refs {
-    id: 16783399
-  }
-  action_refs {
-    id: 16823769
-  }
-  action_refs {
-    id: 16797996
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33604372
-    name: "int_egress.int_prep"
-    alias: "int_prep"
-  }
-  action_refs {
-    id: 16841868
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 1024
-}
 actions {
   preamble {
     id: 16800567
@@ -756,97 +617,6 @@
 }
 actions {
   preamble {
-    id: 16831286
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i0"
-    alias: "int_set_header_0003_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16842664
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i1"
-    alias: "int_set_header_0003_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16816733
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i2"
-    alias: "int_set_header_0003_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16819517
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i3"
-    alias: "int_set_header_0003_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16794056
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i4"
-    alias: "int_set_header_0003_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16804966
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i5"
-    alias: "int_set_header_0003_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16779523
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i6"
-    alias: "int_set_header_0003_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16794789
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i7"
-    alias: "int_set_header_0003_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16834584
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i8"
-    alias: "int_set_header_0003_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16780654
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i9"
-    alias: "int_set_header_0003_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16841202
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i10"
-    alias: "int_set_header_0003_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16800429
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i11"
-    alias: "int_set_header_0003_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16842176
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i12"
-    alias: "int_set_header_0003_i12"
-  }
-}
-actions {
-  preamble {
     id: 16810248
     name: "int_egress.int_metadata_insert.int_set_header_0003_i13"
     alias: "int_set_header_0003_i13"
@@ -854,104 +624,6 @@
 }
 actions {
   preamble {
-    id: 16786933
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i14"
-    alias: "int_set_header_0003_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16828419
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i15"
-    alias: "int_set_header_0003_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16794499
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i0"
-    alias: "int_set_header_0407_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16785636
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i1"
-    alias: "int_set_header_0407_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16819629
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i2"
-    alias: "int_set_header_0407_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16816181
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i3"
-    alias: "int_set_header_0407_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16809168
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i4"
-    alias: "int_set_header_0407_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16798574
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i5"
-    alias: "int_set_header_0407_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16783327
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i6"
-    alias: "int_set_header_0407_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16796243
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i7"
-    alias: "int_set_header_0407_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16787702
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i8"
-    alias: "int_set_header_0407_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16778104
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i9"
-    alias: "int_set_header_0407_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16794531
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i10"
-    alias: "int_set_header_0407_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16805663
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i11"
-    alias: "int_set_header_0407_i11"
-  }
-}
-actions {
-  preamble {
     id: 16809122
     name: "int_egress.int_metadata_insert.int_set_header_0407_i12"
     alias: "int_set_header_0407_i12"
@@ -959,27 +631,6 @@
 }
 actions {
   preamble {
-    id: 16783399
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i13"
-    alias: "int_set_header_0407_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16823769
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i14"
-    alias: "int_set_header_0407_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16797996
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i15"
-    alias: "int_set_header_0407_i15"
-  }
-}
-actions {
-  preamble {
     id: 16796837
     name: "int_egress.int_outer_encap.int_update_ipv4"
     alias: "int_update_ipv4"
@@ -1005,11 +656,6 @@
     name: "int_egress.int_transit"
     alias: "int_transit"
   }
-  params {
-    id: 1
-    name: "switch_id"
-    bitwidth: 32
-  }
 }
 actions {
   preamble {
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/tofino.bin
similarity index 71%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/tofino.bin
index 96f5a23..4afece6 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/mavericks/tofino.bin
Binary files differ
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/context.json
old mode 100644
new mode 100755
similarity index 90%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/context.json
index a1aaebd..d5248e8
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/context.json
@@ -1,5 +1,5 @@
 {
-  "build_date": "03/23/18 21:19:12",
+  "build_date": "03/24/18 19:14:28",
   "schema_version": "1.3.3",
   "compiler_version": "6.0.0-alpha.7",
   "program_name": "main",
@@ -14,7 +14,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32,7 +32,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -50,7 +50,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -68,7 +68,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -86,7 +86,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -104,7 +104,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -122,6 +122,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -147,11 +212,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -162,7 +227,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -173,7 +238,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -184,7 +249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -198,99 +263,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -300,8 +278,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -318,7 +296,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -332,11 +397,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -347,7 +412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -358,7 +423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -369,7 +434,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -383,7 +448,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -401,7 +466,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -419,29 +484,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -455,29 +502,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -495,7 +524,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -513,7 +542,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -531,7 +560,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -549,7 +578,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -616,7 +645,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -635,7 +664,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -654,7 +683,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -673,7 +702,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -718,7 +747,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -737,7 +766,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -756,7 +785,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -775,7 +804,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -820,7 +849,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -839,7 +868,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -858,7 +887,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -877,7 +906,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -891,7 +920,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -909,7 +938,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -927,61 +956,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -992,7 +967,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1003,7 +978,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1014,7 +989,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1028,11 +1003,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1043,7 +1018,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1054,7 +1029,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1065,7 +1040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1079,11 +1054,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1094,7 +1069,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1108,11 +1083,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1123,7 +1098,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1137,12 +1112,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -1159,24 +1188,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -1188,7 +1199,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1210,7 +1221,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1232,7 +1243,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1243,7 +1254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1257,7 +1268,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -1275,7 +1286,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -1290,7 +1301,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1301,7 +1312,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1315,11 +1326,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1330,7 +1341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1344,11 +1355,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1362,6 +1391,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -1399,7 +1446,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1410,7 +1457,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1421,7 +1468,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1432,7 +1479,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1443,7 +1490,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1454,7 +1501,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1465,7 +1512,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1476,7 +1523,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1516,7 +1563,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1527,7 +1574,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1538,7 +1585,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1549,7 +1596,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1560,7 +1607,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1571,7 +1618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1582,7 +1629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1593,7 +1640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1604,7 +1651,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1615,7 +1662,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1626,7 +1673,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1637,7 +1684,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1648,7 +1695,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1659,7 +1706,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1670,7 +1717,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1688,7 +1735,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1699,7 +1746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1710,7 +1757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1721,7 +1768,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1732,7 +1779,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1743,7 +1790,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1754,7 +1801,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1765,7 +1812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1783,7 +1830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1794,7 +1841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1805,7 +1852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1816,7 +1863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1827,7 +1874,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1838,7 +1885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1849,7 +1896,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -1867,7 +1914,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1885,7 +1932,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1914,7 +1961,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -1950,7 +1997,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1961,7 +2008,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1979,7 +2026,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -2026,17 +2073,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -2046,7 +2082,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2064,8 +2100,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -2082,6 +2118,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -2096,11 +2168,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2114,7 +2186,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -2132,11 +2204,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2150,7 +2222,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -2168,29 +2240,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2204,11 +2258,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2222,7 +2276,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -2273,7 +2327,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -2302,94 +2356,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2407,7 +2378,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2425,7 +2396,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2443,7 +2414,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2461,7 +2432,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2479,23 +2450,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -2508,8 +2468,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -2526,25 +2486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2558,40 +2500,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2605,11 +2518,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2623,7 +2536,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -2746,41 +2659,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -2798,7 +2685,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -2810,6 +2723,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -2817,8 +2749,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -2836,8 +2768,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -2855,8 +2787,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -2875,7 +2807,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -2894,7 +2826,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -2912,8 +2844,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -2922,7 +2854,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -2931,25 +2863,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -2957,26 +2870,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -2988,51 +2882,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -3040,8 +2889,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -3059,8 +2908,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -3073,133 +2922,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -3214,25 +2936,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -3250,7 +2954,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -3268,7 +3099,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -3286,11 +3117,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3304,11 +3135,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3322,7 +3153,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -3340,11 +3171,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3355,7 +3186,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3369,11 +3200,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3387,7 +3218,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -3471,7 +3302,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -3522,7 +3353,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -3540,7 +3371,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -3558,7 +3389,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -3576,11 +3407,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -3598,7 +3429,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3609,7 +3440,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3620,7 +3451,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3631,7 +3462,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3682,7 +3513,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3693,7 +3524,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3704,7 +3535,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3715,7 +3546,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3755,7 +3586,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3766,7 +3597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3777,7 +3608,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3788,7 +3619,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3835,7 +3666,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3846,7 +3677,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3886,7 +3717,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3897,7 +3728,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3951,7 +3782,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3969,7 +3800,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3987,7 +3818,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4016,7 +3847,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4045,7 +3876,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4056,7 +3887,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4074,23 +3905,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -4103,10 +3934,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -4114,10 +3945,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -4132,7 +3981,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4143,7 +4043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4154,7 +4054,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4165,7 +4065,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4176,7 +4076,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4187,7 +4087,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4223,7 +4123,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -4241,74 +4141,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -4325,7 +4163,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4334,6 +4172,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -4348,7 +4241,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4366,7 +4259,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4384,7 +4277,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4402,7 +4295,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4420,7 +4313,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4438,7 +4331,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4456,6 +4349,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -4481,11 +4439,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4496,7 +4454,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4507,7 +4465,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4518,7 +4476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4532,99 +4490,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -4634,8 +4505,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -4652,7 +4523,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4666,11 +4624,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4681,7 +4639,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4692,7 +4650,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4703,7 +4661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4717,7 +4675,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -4735,7 +4693,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -4753,29 +4711,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4789,29 +4729,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4829,7 +4751,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4847,7 +4769,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4865,7 +4787,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4883,7 +4805,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4950,7 +4872,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -4969,7 +4891,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -4988,7 +4910,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -5007,7 +4929,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -5052,7 +4974,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -5071,7 +4993,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -5090,7 +5012,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -5109,7 +5031,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -5154,7 +5076,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -5173,7 +5095,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -5192,7 +5114,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -5211,7 +5133,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -5225,7 +5147,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5243,7 +5165,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5261,61 +5183,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5326,7 +5194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5337,7 +5205,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5348,7 +5216,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5362,11 +5230,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5377,7 +5245,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5388,7 +5256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5399,7 +5267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5413,11 +5281,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5428,7 +5296,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5442,11 +5310,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5457,7 +5325,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5471,12 +5339,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -5493,24 +5415,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -5522,7 +5426,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5544,7 +5448,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5566,7 +5470,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5577,7 +5481,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5591,7 +5495,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -5609,7 +5513,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -5624,7 +5528,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5635,7 +5539,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5649,11 +5553,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5664,7 +5568,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5678,11 +5582,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5696,6 +5618,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -5733,7 +5673,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5744,7 +5684,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5755,7 +5695,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5766,7 +5706,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5777,7 +5717,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5788,7 +5728,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5799,7 +5739,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5810,7 +5750,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5850,7 +5790,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5861,7 +5801,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5872,7 +5812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5883,7 +5823,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5894,7 +5834,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5905,7 +5845,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5916,7 +5856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5927,7 +5867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5938,7 +5878,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5949,7 +5889,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5960,7 +5900,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5971,7 +5911,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5982,7 +5922,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5993,7 +5933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6004,7 +5944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6022,7 +5962,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6033,7 +5973,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6044,7 +5984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6055,7 +5995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6066,7 +6006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6077,7 +6017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6088,7 +6028,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6099,7 +6039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6117,7 +6057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6128,7 +6068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6139,7 +6079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6150,7 +6090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6161,7 +6101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6172,7 +6112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6183,7 +6123,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -6201,7 +6141,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6219,7 +6159,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6248,7 +6188,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6284,7 +6224,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6295,7 +6235,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6313,7 +6253,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -6360,17 +6300,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -6380,7 +6309,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6398,8 +6327,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -6416,6 +6345,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -6430,11 +6395,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6448,7 +6413,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -6466,11 +6431,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6484,7 +6449,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -6502,29 +6467,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6538,11 +6485,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6556,7 +6503,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -6607,7 +6554,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -6636,94 +6583,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6741,7 +6605,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6759,7 +6623,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6777,7 +6641,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6795,7 +6659,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6813,23 +6677,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -6842,8 +6695,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -6860,25 +6713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6892,40 +6727,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6939,11 +6745,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6957,7 +6763,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -7080,41 +6886,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -7132,7 +6912,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -7144,6 +6950,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -7151,8 +6976,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -7170,8 +6995,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -7189,8 +7014,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -7209,7 +7034,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -7228,7 +7053,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -7246,8 +7071,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -7256,7 +7081,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -7265,25 +7090,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -7291,26 +7097,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -7322,51 +7109,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -7374,8 +7116,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -7393,8 +7135,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -7407,133 +7149,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -7548,25 +7163,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -7584,7 +7181,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -7602,7 +7326,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -7620,11 +7344,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7638,11 +7362,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7656,7 +7380,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -7674,11 +7398,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7689,7 +7413,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7703,11 +7427,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7721,7 +7445,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -7805,7 +7529,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -7856,7 +7580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -7874,7 +7598,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -7892,7 +7616,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -7910,11 +7634,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -7932,7 +7656,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7943,7 +7667,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7954,7 +7678,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7965,7 +7689,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8016,7 +7740,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8027,7 +7751,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8038,7 +7762,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8049,7 +7773,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8089,7 +7813,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8100,7 +7824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8111,7 +7835,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8122,7 +7846,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8169,7 +7893,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8180,7 +7904,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8220,7 +7944,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8231,7 +7955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8285,7 +8009,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8303,7 +8027,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8321,7 +8045,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8350,7 +8074,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8379,7 +8103,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8390,7 +8114,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8408,23 +8132,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -8437,10 +8161,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -8448,10 +8172,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -8466,7 +8208,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8477,7 +8270,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8488,7 +8281,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8499,7 +8292,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8510,7 +8303,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8521,7 +8314,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8557,7 +8350,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -8575,74 +8368,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -8659,7 +8390,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8668,6 +8399,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -8682,7 +8468,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8700,7 +8486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8718,7 +8504,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8736,7 +8522,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8754,7 +8540,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8772,7 +8558,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8790,6 +8576,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -8815,11 +8666,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8830,7 +8681,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8841,7 +8692,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8852,7 +8703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8866,99 +8717,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -8968,8 +8732,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -8986,7 +8750,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9000,11 +8851,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9015,7 +8866,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9026,7 +8877,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9037,7 +8888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9051,7 +8902,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -9069,7 +8920,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -9087,29 +8938,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9123,29 +8956,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9163,7 +8978,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9181,7 +8996,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9199,7 +9014,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9217,7 +9032,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9284,7 +9099,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -9303,7 +9118,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -9322,7 +9137,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -9341,7 +9156,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -9386,7 +9201,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -9405,7 +9220,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -9424,7 +9239,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -9443,7 +9258,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -9488,7 +9303,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -9507,7 +9322,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -9526,7 +9341,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -9545,7 +9360,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -9559,7 +9374,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9577,7 +9392,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9595,61 +9410,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9660,7 +9421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9671,7 +9432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9682,7 +9443,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9696,11 +9457,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9711,7 +9472,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9722,7 +9483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9733,7 +9494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9747,11 +9508,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9762,7 +9523,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9776,11 +9537,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9791,7 +9552,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9805,12 +9566,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -9827,24 +9642,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -9856,7 +9653,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9878,7 +9675,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9900,7 +9697,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9911,7 +9708,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9925,7 +9722,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -9943,7 +9740,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -9958,7 +9755,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9969,7 +9766,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9983,11 +9780,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9998,7 +9795,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10012,11 +9809,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10030,6 +9845,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -10067,7 +9900,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10078,7 +9911,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10089,7 +9922,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10100,7 +9933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10111,7 +9944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10122,7 +9955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10133,7 +9966,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10144,7 +9977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10184,7 +10017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10195,7 +10028,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10206,7 +10039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10217,7 +10050,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10228,7 +10061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10239,7 +10072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10250,7 +10083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10261,7 +10094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10272,7 +10105,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10283,7 +10116,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10294,7 +10127,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10305,7 +10138,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10316,7 +10149,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10327,7 +10160,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10338,7 +10171,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10356,7 +10189,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10367,7 +10200,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10378,7 +10211,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10389,7 +10222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10400,7 +10233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10411,7 +10244,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10422,7 +10255,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10433,7 +10266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10451,7 +10284,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10462,7 +10295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10473,7 +10306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10484,7 +10317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10495,7 +10328,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10506,7 +10339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10517,7 +10350,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -10535,7 +10368,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10553,7 +10386,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10582,7 +10415,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -10618,7 +10451,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10629,7 +10462,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10647,7 +10480,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -10694,17 +10527,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -10714,7 +10536,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10732,8 +10554,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -10750,6 +10572,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -10764,11 +10622,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10782,7 +10640,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -10800,11 +10658,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10818,7 +10676,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -10836,29 +10694,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10872,11 +10712,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10890,7 +10730,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -10941,7 +10781,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -10970,94 +10810,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11075,7 +10832,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11093,7 +10850,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11111,7 +10868,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11129,7 +10886,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11147,23 +10904,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -11176,8 +10922,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -11194,25 +10940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11226,40 +10954,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11273,11 +10972,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11291,7 +10990,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -11414,41 +11113,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -11466,7 +11139,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -11478,6 +11177,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -11485,8 +11203,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -11504,8 +11222,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -11523,8 +11241,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -11543,7 +11261,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -11562,7 +11280,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -11580,8 +11298,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -11590,7 +11308,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -11599,25 +11317,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -11625,26 +11324,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -11656,51 +11336,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -11708,8 +11343,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -11727,8 +11362,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -11741,133 +11376,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -11882,25 +11390,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -11918,7 +11408,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -11936,7 +11553,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -11954,11 +11571,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11972,11 +11589,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11990,7 +11607,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -12008,11 +11625,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12023,7 +11640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12037,11 +11654,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12055,7 +11672,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -12139,7 +11756,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -12190,7 +11807,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -12208,7 +11825,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -12226,7 +11843,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -12244,11 +11861,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -12266,7 +11883,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12277,7 +11894,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12288,7 +11905,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12299,7 +11916,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12350,7 +11967,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12361,7 +11978,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12372,7 +11989,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12383,7 +12000,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12423,7 +12040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12434,7 +12051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12445,7 +12062,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12456,7 +12073,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12503,7 +12120,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12514,7 +12131,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12554,7 +12171,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12565,7 +12182,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12619,7 +12236,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12637,7 +12254,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12655,7 +12272,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12684,7 +12301,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12713,7 +12330,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -12724,7 +12341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -12742,23 +12359,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -12771,10 +12388,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -12782,10 +12399,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -12800,7 +12435,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12811,7 +12497,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12822,7 +12508,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12833,7 +12519,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12844,7 +12530,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12855,7 +12541,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12891,7 +12577,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -12909,74 +12595,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -12993,7 +12617,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13002,6 +12626,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -13016,7 +12695,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13034,7 +12713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13052,7 +12731,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13070,7 +12749,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13088,7 +12767,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13106,7 +12785,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13124,6 +12803,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -13149,11 +12893,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13164,7 +12908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13175,7 +12919,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13186,7 +12930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13200,99 +12944,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -13302,8 +12959,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -13320,7 +12977,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13334,11 +13078,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13349,7 +13093,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13360,7 +13104,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13371,7 +13115,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13385,7 +13129,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -13403,7 +13147,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -13421,29 +13165,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13457,29 +13183,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13497,7 +13205,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13515,7 +13223,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13533,7 +13241,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13551,7 +13259,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13618,7 +13326,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -13637,7 +13345,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -13656,7 +13364,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -13675,7 +13383,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -13720,7 +13428,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -13739,7 +13447,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -13758,7 +13466,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -13777,7 +13485,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -13822,7 +13530,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -13841,7 +13549,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -13860,7 +13568,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -13879,7 +13587,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -13893,7 +13601,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13911,7 +13619,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13929,61 +13637,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13994,7 +13648,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14005,7 +13659,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14016,7 +13670,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14030,11 +13684,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14045,7 +13699,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14056,7 +13710,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14067,7 +13721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14081,11 +13735,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14096,7 +13750,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14110,11 +13764,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14125,7 +13779,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14139,12 +13793,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -14161,24 +13869,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -14190,7 +13880,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14212,7 +13902,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14234,7 +13924,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14245,7 +13935,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14259,7 +13949,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -14277,7 +13967,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -14292,7 +13982,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14303,7 +13993,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14317,11 +14007,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14332,7 +14022,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14346,11 +14036,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14364,6 +14072,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -14401,7 +14127,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14412,7 +14138,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14423,7 +14149,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14434,7 +14160,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14445,7 +14171,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14456,7 +14182,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14467,7 +14193,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14478,7 +14204,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14518,7 +14244,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14529,7 +14255,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14540,7 +14266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14551,7 +14277,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14562,7 +14288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14573,7 +14299,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14584,7 +14310,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14595,7 +14321,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14606,7 +14332,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14617,7 +14343,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14628,7 +14354,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14639,7 +14365,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14650,7 +14376,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14661,7 +14387,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14672,7 +14398,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14690,7 +14416,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14701,7 +14427,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14712,7 +14438,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14723,7 +14449,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14734,7 +14460,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14745,7 +14471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14756,7 +14482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14767,7 +14493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14785,7 +14511,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14796,7 +14522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14807,7 +14533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14818,7 +14544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14829,7 +14555,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14840,7 +14566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14851,7 +14577,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -14869,7 +14595,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14887,7 +14613,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14916,7 +14642,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -14952,7 +14678,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14963,7 +14689,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14981,7 +14707,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -15028,17 +14754,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -15048,7 +14763,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15066,8 +14781,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -15084,6 +14799,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -15098,11 +14849,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15116,7 +14867,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -15134,11 +14885,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15152,7 +14903,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -15170,29 +14921,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15206,11 +14939,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15224,7 +14957,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -15275,7 +15008,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -15304,94 +15037,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15409,7 +15059,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15427,7 +15077,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15445,7 +15095,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15463,7 +15113,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15481,23 +15131,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -15510,8 +15149,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -15528,25 +15167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15560,40 +15181,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15607,11 +15199,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15625,7 +15217,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -15748,41 +15340,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -15800,7 +15366,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -15812,6 +15404,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -15819,8 +15430,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -15838,8 +15449,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -15857,8 +15468,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -15877,7 +15488,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -15896,7 +15507,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -15914,8 +15525,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -15924,7 +15535,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -15933,25 +15544,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -15959,26 +15551,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -15990,51 +15563,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -16042,8 +15570,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -16061,8 +15589,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -16075,133 +15603,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -16216,25 +15617,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -16252,7 +15635,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -16270,7 +15780,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -16288,11 +15798,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16306,11 +15816,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16324,7 +15834,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -16342,11 +15852,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16357,7 +15867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16371,11 +15881,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16389,7 +15899,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -16473,7 +15983,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -16524,7 +16034,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -16542,7 +16052,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -16560,7 +16070,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -16578,11 +16088,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -16600,7 +16110,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16611,7 +16121,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16622,7 +16132,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16633,7 +16143,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16684,7 +16194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16695,7 +16205,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16706,7 +16216,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16717,7 +16227,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16757,7 +16267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16768,7 +16278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16779,7 +16289,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16790,7 +16300,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16837,7 +16347,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16848,7 +16358,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16888,7 +16398,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16899,7 +16409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16953,7 +16463,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16971,7 +16481,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16989,7 +16499,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17018,7 +16528,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17047,7 +16557,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17058,7 +16568,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17076,23 +16586,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -17105,10 +16615,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -17116,10 +16626,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -17134,7 +16662,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17145,7 +16724,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17156,7 +16735,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17167,7 +16746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17178,7 +16757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17189,7 +16768,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17225,7 +16804,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -17243,74 +16822,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -17327,7 +16844,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17336,6 +16853,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -17350,7 +16922,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17368,7 +16940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17386,7 +16958,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17404,7 +16976,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17422,7 +16994,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17440,7 +17012,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17458,6 +17030,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -17483,11 +17120,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17498,7 +17135,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17509,7 +17146,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17520,7 +17157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17534,99 +17171,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -17636,8 +17186,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -17654,7 +17204,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17668,11 +17305,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17683,7 +17320,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17694,7 +17331,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17705,7 +17342,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17719,7 +17356,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -17737,7 +17374,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -17755,29 +17392,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17791,29 +17410,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17831,7 +17432,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17849,7 +17450,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17867,7 +17468,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17885,7 +17486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17952,7 +17553,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -17971,7 +17572,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -17990,7 +17591,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -18009,7 +17610,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -18054,7 +17655,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -18073,7 +17674,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -18092,7 +17693,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -18111,7 +17712,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -18156,7 +17757,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -18175,7 +17776,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -18194,7 +17795,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -18213,7 +17814,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -18227,7 +17828,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18245,7 +17846,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18263,61 +17864,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18328,7 +17875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18339,7 +17886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18350,7 +17897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18364,11 +17911,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18379,7 +17926,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18390,7 +17937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18401,7 +17948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18415,11 +17962,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18430,7 +17977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18444,11 +17991,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18459,7 +18006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18473,12 +18020,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -18495,24 +18096,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -18524,7 +18107,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18546,7 +18129,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18568,7 +18151,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18579,7 +18162,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18593,7 +18176,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -18611,7 +18194,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -18626,7 +18209,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18637,7 +18220,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18651,11 +18234,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18666,7 +18249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18680,11 +18263,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18698,6 +18299,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -18735,7 +18354,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18746,7 +18365,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18757,7 +18376,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18768,7 +18387,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18779,7 +18398,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18790,7 +18409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18801,7 +18420,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18812,7 +18431,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18852,7 +18471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18863,7 +18482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18874,7 +18493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18885,7 +18504,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18896,7 +18515,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18907,7 +18526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18918,7 +18537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18929,7 +18548,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18940,7 +18559,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18951,7 +18570,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18962,7 +18581,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18973,7 +18592,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18984,7 +18603,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18995,7 +18614,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19006,7 +18625,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19024,7 +18643,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19035,7 +18654,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19046,7 +18665,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19057,7 +18676,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19068,7 +18687,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19079,7 +18698,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19090,7 +18709,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19101,7 +18720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19119,7 +18738,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19130,7 +18749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19141,7 +18760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19152,7 +18771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19163,7 +18782,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19174,7 +18793,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19185,7 +18804,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -19203,7 +18822,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19221,7 +18840,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19250,7 +18869,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19286,7 +18905,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19297,7 +18916,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19315,7 +18934,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -19362,17 +18981,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -19382,7 +18990,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19400,8 +19008,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -19418,6 +19026,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -19432,11 +19076,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19450,7 +19094,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -19468,11 +19112,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19486,7 +19130,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -19504,29 +19148,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19540,11 +19166,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19558,7 +19184,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -19609,7 +19235,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -19638,94 +19264,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19743,7 +19286,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19761,7 +19304,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19779,7 +19322,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19797,7 +19340,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19815,23 +19358,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -19844,8 +19376,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -19862,25 +19394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19894,40 +19408,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19941,11 +19426,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19959,7 +19444,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -20082,41 +19567,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -20134,7 +19593,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -20146,6 +19631,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -20153,8 +19657,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -20172,8 +19676,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -20191,8 +19695,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -20211,7 +19715,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -20230,7 +19734,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -20248,8 +19752,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -20258,7 +19762,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -20267,25 +19771,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -20293,26 +19778,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -20324,51 +19790,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -20376,8 +19797,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -20395,8 +19816,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -20409,133 +19830,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -20550,25 +19844,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -20586,7 +19862,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -20604,7 +20007,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -20622,11 +20025,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20640,11 +20043,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20658,7 +20061,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -20676,11 +20079,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20691,7 +20094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20705,11 +20108,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20723,7 +20126,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -20807,7 +20210,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -20858,7 +20261,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -20876,7 +20279,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -20894,7 +20297,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -20912,11 +20315,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -20934,7 +20337,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20945,7 +20348,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20956,7 +20359,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20967,7 +20370,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21018,7 +20421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21029,7 +20432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21040,7 +20443,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21051,7 +20454,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21091,7 +20494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21102,7 +20505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21113,7 +20516,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21124,7 +20527,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21171,7 +20574,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21182,7 +20585,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21222,7 +20625,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21233,7 +20636,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21287,7 +20690,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21305,7 +20708,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21323,7 +20726,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21352,7 +20755,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21381,7 +20784,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21392,7 +20795,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21410,23 +20813,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -21439,10 +20842,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -21450,10 +20853,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -21468,7 +20889,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21479,7 +20951,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21490,7 +20962,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21501,7 +20973,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21512,7 +20984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21523,7 +20995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21559,7 +21031,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -21577,74 +21049,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -21661,7 +21071,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21670,6 +21080,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -21684,7 +21149,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21702,7 +21167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21720,7 +21185,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21738,7 +21203,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21756,7 +21221,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21774,7 +21239,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21792,6 +21257,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -21817,11 +21347,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21832,7 +21362,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21843,7 +21373,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21854,7 +21384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21868,99 +21398,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -21970,8 +21413,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -21988,7 +21431,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22002,11 +21532,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22017,7 +21547,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22028,7 +21558,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22039,7 +21569,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22053,7 +21583,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -22071,7 +21601,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -22089,29 +21619,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22125,29 +21637,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22165,7 +21659,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22183,7 +21677,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22201,7 +21695,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22219,7 +21713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22286,7 +21780,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -22305,7 +21799,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -22324,7 +21818,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -22343,7 +21837,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -22388,7 +21882,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -22407,7 +21901,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -22426,7 +21920,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -22445,7 +21939,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -22490,7 +21984,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -22509,7 +22003,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -22528,7 +22022,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -22547,7 +22041,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -22561,7 +22055,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22579,7 +22073,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22597,61 +22091,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22662,7 +22102,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22673,7 +22113,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22684,7 +22124,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22698,11 +22138,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22713,7 +22153,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22724,7 +22164,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22735,7 +22175,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22749,11 +22189,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22764,7 +22204,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22778,11 +22218,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22793,7 +22233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22807,12 +22247,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -22829,24 +22323,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -22858,7 +22334,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22880,7 +22356,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22902,7 +22378,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22913,7 +22389,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22927,7 +22403,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -22945,7 +22421,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -22960,7 +22436,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22971,7 +22447,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22985,11 +22461,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23000,7 +22476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23014,11 +22490,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23032,6 +22526,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -23069,7 +22581,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23080,7 +22592,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23091,7 +22603,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23102,7 +22614,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23113,7 +22625,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23124,7 +22636,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23135,7 +22647,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23146,7 +22658,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23186,7 +22698,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23197,7 +22709,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23208,7 +22720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23219,7 +22731,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23230,7 +22742,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23241,7 +22753,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23252,7 +22764,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23263,7 +22775,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23274,7 +22786,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23285,7 +22797,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23296,7 +22808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23307,7 +22819,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23318,7 +22830,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23329,7 +22841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23340,7 +22852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23358,7 +22870,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23369,7 +22881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23380,7 +22892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23391,7 +22903,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23402,7 +22914,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23413,7 +22925,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23424,7 +22936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23435,7 +22947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23453,7 +22965,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23464,7 +22976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23475,7 +22987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23486,7 +22998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23497,7 +23009,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23508,7 +23020,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23519,7 +23031,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -23537,7 +23049,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23555,7 +23067,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23584,7 +23096,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -23620,7 +23132,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23631,7 +23143,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23649,7 +23161,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -23696,17 +23208,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -23716,7 +23217,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23734,8 +23235,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -23752,6 +23253,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -23766,11 +23303,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23784,7 +23321,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -23802,11 +23339,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23820,7 +23357,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -23838,29 +23375,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23874,11 +23393,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23892,7 +23411,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -23943,7 +23462,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -23972,94 +23491,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24077,7 +23513,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24095,7 +23531,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24113,7 +23549,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24131,7 +23567,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24149,23 +23585,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -24178,8 +23603,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -24196,25 +23621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24228,40 +23635,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24275,11 +23653,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24293,7 +23671,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -24416,41 +23794,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -24468,7 +23820,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -24480,6 +23858,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -24487,8 +23884,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -24506,8 +23903,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -24525,8 +23922,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -24545,7 +23942,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -24564,7 +23961,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -24582,8 +23979,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -24592,7 +23989,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -24601,25 +23998,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -24627,26 +24005,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -24658,51 +24017,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -24710,8 +24024,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -24729,8 +24043,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -24743,133 +24057,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -24884,25 +24071,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -24920,7 +24089,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -24938,7 +24234,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -24956,11 +24252,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24974,11 +24270,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24992,7 +24288,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -25010,11 +24306,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25025,7 +24321,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25039,11 +24335,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25057,7 +24353,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -25141,7 +24437,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -25192,7 +24488,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -25210,7 +24506,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -25228,7 +24524,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -25246,11 +24542,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -25268,7 +24564,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25279,7 +24575,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25290,7 +24586,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25301,7 +24597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25352,7 +24648,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25363,7 +24659,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25374,7 +24670,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25385,7 +24681,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25425,7 +24721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25436,7 +24732,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25447,7 +24743,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25458,7 +24754,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25505,7 +24801,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25516,7 +24812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25556,7 +24852,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25567,7 +24863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25621,7 +24917,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25639,7 +24935,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25657,7 +24953,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25686,7 +24982,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25715,7 +25011,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -25726,7 +25022,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -25744,23 +25040,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -25773,10 +25069,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -25784,10 +25080,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -25802,7 +25116,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25813,7 +25178,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25824,7 +25189,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25835,7 +25200,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25846,7 +25211,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25857,7 +25222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25893,7 +25258,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -25911,74 +25276,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -25995,7 +25298,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26004,6 +25307,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -26018,7 +25376,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26036,7 +25394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26054,7 +25412,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26072,7 +25430,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26090,7 +25448,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26108,7 +25466,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26126,6 +25484,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -26151,11 +25574,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26166,7 +25589,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26177,7 +25600,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26188,7 +25611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26202,99 +25625,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -26304,8 +25640,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -26322,7 +25658,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26336,11 +25759,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26351,7 +25774,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26362,7 +25785,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26373,7 +25796,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26387,7 +25810,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -26405,7 +25828,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -26423,29 +25846,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26459,29 +25864,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26499,7 +25886,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26517,7 +25904,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26535,7 +25922,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26553,7 +25940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26620,7 +26007,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -26639,7 +26026,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -26658,7 +26045,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -26677,7 +26064,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -26722,7 +26109,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -26741,7 +26128,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -26760,7 +26147,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -26779,7 +26166,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -26824,7 +26211,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -26843,7 +26230,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -26862,7 +26249,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -26881,7 +26268,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -26895,7 +26282,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26913,7 +26300,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26931,61 +26318,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26996,7 +26329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27007,7 +26340,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27018,7 +26351,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27032,11 +26365,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27047,7 +26380,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27058,7 +26391,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27069,7 +26402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27083,11 +26416,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27098,7 +26431,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27112,11 +26445,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27127,7 +26460,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27141,12 +26474,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -27163,24 +26550,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -27192,7 +26561,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27214,7 +26583,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27236,7 +26605,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27247,7 +26616,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27261,7 +26630,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -27279,7 +26648,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -27294,7 +26663,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27305,7 +26674,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27319,11 +26688,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27334,7 +26703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27348,11 +26717,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27366,6 +26753,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -27403,7 +26808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27414,7 +26819,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27425,7 +26830,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27436,7 +26841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27447,7 +26852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27458,7 +26863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27469,7 +26874,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27480,7 +26885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27520,7 +26925,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27531,7 +26936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27542,7 +26947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27553,7 +26958,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27564,7 +26969,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27575,7 +26980,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27586,7 +26991,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27597,7 +27002,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27608,7 +27013,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27619,7 +27024,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27630,7 +27035,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27641,7 +27046,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27652,7 +27057,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27663,7 +27068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27674,7 +27079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27692,7 +27097,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27703,7 +27108,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27714,7 +27119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27725,7 +27130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27736,7 +27141,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27747,7 +27152,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27758,7 +27163,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27769,7 +27174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27787,7 +27192,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27798,7 +27203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27809,7 +27214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27820,7 +27225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27831,7 +27236,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27842,7 +27247,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27853,7 +27258,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -27871,7 +27276,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27889,7 +27294,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27918,7 +27323,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -27954,7 +27359,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27965,7 +27370,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27983,7 +27388,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -28030,17 +27435,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -28050,7 +27444,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28068,8 +27462,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -28086,6 +27480,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -28100,11 +27530,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28118,7 +27548,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -28136,11 +27566,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28154,7 +27584,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -28172,29 +27602,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28208,11 +27620,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28226,7 +27638,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -28277,7 +27689,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -28306,94 +27718,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28411,7 +27740,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28429,7 +27758,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28447,7 +27776,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28465,7 +27794,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28483,23 +27812,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -28512,8 +27830,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -28530,25 +27848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28562,40 +27862,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28609,11 +27880,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28627,7 +27898,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -28750,41 +28021,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -28802,7 +28047,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -28814,6 +28085,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -28821,8 +28111,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -28840,8 +28130,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -28859,8 +28149,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -28879,7 +28169,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -28898,7 +28188,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -28916,8 +28206,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -28926,7 +28216,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -28935,25 +28225,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -28961,26 +28232,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -28992,51 +28244,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -29044,8 +28251,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -29063,8 +28270,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -29077,133 +28284,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -29218,25 +28298,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -29254,7 +28316,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -29272,7 +28461,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -29290,11 +28479,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29308,11 +28497,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29326,7 +28515,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -29344,11 +28533,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29359,7 +28548,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29373,11 +28562,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29391,7 +28580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -29475,7 +28664,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -29526,7 +28715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -29544,7 +28733,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -29562,7 +28751,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -29580,11 +28769,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -29602,7 +28791,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29613,7 +28802,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29624,7 +28813,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29635,7 +28824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29686,7 +28875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29697,7 +28886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29708,7 +28897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29719,7 +28908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29759,7 +28948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29770,7 +28959,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29781,7 +28970,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29792,7 +28981,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29839,7 +29028,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29850,7 +29039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29890,7 +29079,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29901,7 +29090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29955,7 +29144,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29973,7 +29162,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29991,7 +29180,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30020,7 +29209,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30049,7 +29238,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30060,7 +29249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30078,23 +29267,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -30107,10 +29296,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -30118,10 +29307,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -30136,7 +29343,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30147,7 +29405,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30158,7 +29416,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30169,7 +29427,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30180,7 +29438,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30191,7 +29449,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30227,7 +29485,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -30245,74 +29503,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -30329,7 +29525,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30338,6 +29534,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -30352,7 +29603,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30370,7 +29621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30388,7 +29639,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30406,7 +29657,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30424,7 +29675,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30442,7 +29693,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30460,6 +29711,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -30485,11 +29801,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30500,7 +29816,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30511,7 +29827,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30522,7 +29838,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30536,99 +29852,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -30638,8 +29867,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -30656,7 +29885,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30670,11 +29986,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30685,7 +30001,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30696,7 +30012,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30707,7 +30023,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30721,7 +30037,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -30739,7 +30055,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -30757,29 +30073,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30793,29 +30091,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30833,7 +30113,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30851,7 +30131,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30869,7 +30149,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30887,7 +30167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30954,7 +30234,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -30973,7 +30253,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -30992,7 +30272,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -31011,7 +30291,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -31056,7 +30336,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -31075,7 +30355,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -31094,7 +30374,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -31113,7 +30393,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -31158,7 +30438,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -31177,7 +30457,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -31196,7 +30476,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -31215,7 +30495,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -31229,7 +30509,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31247,7 +30527,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31265,61 +30545,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31330,7 +30556,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31341,7 +30567,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31352,7 +30578,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31366,11 +30592,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31381,7 +30607,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31392,7 +30618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31403,7 +30629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31417,11 +30643,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31432,7 +30658,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31446,11 +30672,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31461,7 +30687,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31475,12 +30701,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -31497,24 +30777,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -31526,7 +30788,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31548,7 +30810,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31570,7 +30832,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31581,7 +30843,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31595,7 +30857,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -31613,7 +30875,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -31628,7 +30890,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31639,7 +30901,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31653,11 +30915,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31668,7 +30930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31682,11 +30944,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31700,6 +30980,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -31737,7 +31035,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31748,7 +31046,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31759,7 +31057,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31770,7 +31068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31781,7 +31079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31792,7 +31090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31803,7 +31101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31814,7 +31112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31854,7 +31152,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31865,7 +31163,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31876,7 +31174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31887,7 +31185,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31898,7 +31196,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31909,7 +31207,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31920,7 +31218,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31931,7 +31229,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31942,7 +31240,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31953,7 +31251,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31964,7 +31262,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31975,7 +31273,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31986,7 +31284,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31997,7 +31295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32008,7 +31306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32026,7 +31324,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32037,7 +31335,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32048,7 +31346,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32059,7 +31357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32070,7 +31368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32081,7 +31379,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32092,7 +31390,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32103,7 +31401,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32121,7 +31419,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32132,7 +31430,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32143,7 +31441,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32154,7 +31452,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32165,7 +31463,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32176,7 +31474,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32187,7 +31485,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -32205,7 +31503,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32223,7 +31521,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32252,7 +31550,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32288,7 +31586,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -32299,7 +31597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -32317,7 +31615,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -32364,17 +31662,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -32384,7 +31671,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32402,8 +31689,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -32420,6 +31707,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -32434,11 +31757,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32452,7 +31775,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -32470,11 +31793,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32488,7 +31811,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -32506,29 +31829,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32542,11 +31847,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32560,7 +31865,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -32611,7 +31916,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -32640,94 +31945,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32745,7 +31967,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32763,7 +31985,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32781,7 +32003,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32799,7 +32021,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32817,23 +32039,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -32846,8 +32057,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -32864,25 +32075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32896,40 +32089,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32943,11 +32107,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32961,7 +32125,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -33084,41 +32248,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -33136,7 +32274,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -33148,6 +32312,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -33155,8 +32338,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -33174,8 +32357,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -33193,8 +32376,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -33213,7 +32396,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -33232,7 +32415,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -33250,8 +32433,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -33260,7 +32443,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -33269,25 +32452,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -33295,26 +32459,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -33326,51 +32471,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -33378,8 +32478,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -33397,8 +32497,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -33411,133 +32511,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -33552,25 +32525,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -33588,7 +32543,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -33606,7 +32688,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -33624,11 +32706,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33642,11 +32724,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33660,7 +32742,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -33678,11 +32760,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33693,7 +32775,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33707,11 +32789,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33725,7 +32807,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -33809,7 +32891,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -33860,7 +32942,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -33878,7 +32960,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -33896,7 +32978,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -33914,11 +32996,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -33936,7 +33018,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33947,7 +33029,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33958,7 +33040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33969,7 +33051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34020,7 +33102,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34031,7 +33113,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34042,7 +33124,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34053,7 +33135,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34093,7 +33175,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34104,7 +33186,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34115,7 +33197,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34126,7 +33208,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34173,7 +33255,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34184,7 +33266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34224,7 +33306,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34235,7 +33317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34289,7 +33371,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34307,7 +33389,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34325,7 +33407,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34354,7 +33436,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34383,7 +33465,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -34394,7 +33476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -34412,23 +33494,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -34441,10 +33523,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -34452,10 +33534,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -34470,7 +33570,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34481,7 +33632,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34492,7 +33643,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34503,7 +33654,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34514,7 +33665,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34525,7 +33676,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34561,7 +33712,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -34579,74 +33730,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -34663,7 +33752,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34672,6 +33761,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -34686,7 +33830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34704,7 +33848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34722,7 +33866,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34740,7 +33884,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34758,7 +33902,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34776,7 +33920,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34794,6 +33938,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -34819,11 +34028,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34834,7 +34043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34845,7 +34054,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34856,7 +34065,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34870,99 +34079,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -34972,8 +34094,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -34990,7 +34112,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35004,11 +34213,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35019,7 +34228,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35030,7 +34239,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35041,7 +34250,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35055,7 +34264,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -35073,7 +34282,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -35091,29 +34300,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35127,29 +34318,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35167,7 +34340,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35185,7 +34358,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35203,7 +34376,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35221,7 +34394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35288,7 +34461,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -35307,7 +34480,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -35326,7 +34499,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -35345,7 +34518,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -35390,7 +34563,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -35409,7 +34582,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -35428,7 +34601,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -35447,7 +34620,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -35492,7 +34665,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -35511,7 +34684,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -35530,7 +34703,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -35549,7 +34722,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -35563,7 +34736,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35581,7 +34754,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35599,61 +34772,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35664,7 +34783,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35675,7 +34794,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35686,7 +34805,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35700,11 +34819,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35715,7 +34834,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35726,7 +34845,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35737,7 +34856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35751,11 +34870,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35766,7 +34885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35780,11 +34899,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35795,7 +34914,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35809,12 +34928,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -35831,24 +35004,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -35860,7 +35015,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35882,7 +35037,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35904,7 +35059,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35915,7 +35070,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35929,7 +35084,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -35947,7 +35102,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -35962,7 +35117,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35973,7 +35128,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35987,11 +35142,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36002,7 +35157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36016,11 +35171,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36034,6 +35207,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -36071,7 +35262,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36082,7 +35273,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36093,7 +35284,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36104,7 +35295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36115,7 +35306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36126,7 +35317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36137,7 +35328,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36148,7 +35339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36188,7 +35379,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36199,7 +35390,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36210,7 +35401,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36221,7 +35412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36232,7 +35423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36243,7 +35434,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36254,7 +35445,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36265,7 +35456,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36276,7 +35467,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36287,7 +35478,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36298,7 +35489,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36309,7 +35500,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36320,7 +35511,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36331,7 +35522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36342,7 +35533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36360,7 +35551,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36371,7 +35562,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36382,7 +35573,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36393,7 +35584,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36404,7 +35595,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36415,7 +35606,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36426,7 +35617,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36437,7 +35628,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36455,7 +35646,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36466,7 +35657,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36477,7 +35668,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36488,7 +35679,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36499,7 +35690,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36510,7 +35701,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36521,7 +35712,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -36539,7 +35730,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36557,7 +35748,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36586,7 +35777,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -36622,7 +35813,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36633,7 +35824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36651,7 +35842,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -36698,17 +35889,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -36718,7 +35898,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36736,8 +35916,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -36754,6 +35934,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -36768,11 +35984,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36786,7 +36002,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -36804,11 +36020,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36822,7 +36038,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -36840,29 +36056,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36876,11 +36074,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36894,7 +36092,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -36945,7 +36143,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -36974,94 +36172,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37079,7 +36194,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37097,7 +36212,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37115,7 +36230,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37133,7 +36248,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37151,23 +36266,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -37180,8 +36284,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -37198,25 +36302,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37230,40 +36316,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37277,11 +36334,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37295,7 +36352,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -37418,41 +36475,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -37470,7 +36501,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -37482,6 +36539,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -37489,8 +36565,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -37508,8 +36584,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -37527,8 +36603,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -37547,7 +36623,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -37566,7 +36642,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -37584,8 +36660,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -37594,7 +36670,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -37603,25 +36679,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -37629,26 +36686,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -37660,51 +36698,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -37712,8 +36705,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -37731,8 +36724,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -37745,133 +36738,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -37886,25 +36752,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -37922,7 +36770,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -37940,7 +36915,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -37958,11 +36933,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -37976,11 +36951,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -37994,7 +36969,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -38012,11 +36987,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38027,7 +37002,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38041,11 +37016,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38059,7 +37034,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -38143,7 +37118,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -38194,7 +37169,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -38212,7 +37187,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -38230,7 +37205,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -38248,11 +37223,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -38270,7 +37245,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38281,7 +37256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38292,7 +37267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38303,7 +37278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38354,7 +37329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38365,7 +37340,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38376,7 +37351,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38387,7 +37362,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38427,7 +37402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38438,7 +37413,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38449,7 +37424,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38460,7 +37435,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38507,7 +37482,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38518,7 +37493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38558,7 +37533,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38569,7 +37544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38623,7 +37598,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38641,7 +37616,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38659,7 +37634,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38688,7 +37663,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38717,7 +37692,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -38728,7 +37703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -38746,23 +37721,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -38775,10 +37750,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -38786,10 +37761,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -38804,7 +37797,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38815,7 +37859,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38826,7 +37870,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38837,7 +37881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38848,7 +37892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38859,7 +37903,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38895,7 +37939,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -38913,74 +37957,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -38997,7 +37979,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39006,6 +37988,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -39020,7 +38057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39038,7 +38075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39056,7 +38093,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39074,7 +38111,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39092,7 +38129,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39110,7 +38147,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39128,6 +38165,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -39153,11 +38255,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39168,7 +38270,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39179,7 +38281,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39190,7 +38292,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39204,99 +38306,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -39306,8 +38321,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -39324,7 +38339,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39338,11 +38440,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39353,7 +38455,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39364,7 +38466,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39375,7 +38477,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39389,7 +38491,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -39407,7 +38509,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -39425,29 +38527,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39461,29 +38545,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39501,7 +38567,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39519,7 +38585,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39537,7 +38603,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39555,7 +38621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39622,7 +38688,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -39641,7 +38707,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -39660,7 +38726,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -39679,7 +38745,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -39724,7 +38790,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -39743,7 +38809,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -39762,7 +38828,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -39781,7 +38847,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -39826,7 +38892,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -39845,7 +38911,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -39864,7 +38930,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -39883,7 +38949,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -39897,7 +38963,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39915,7 +38981,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39933,61 +38999,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39998,7 +39010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40009,7 +39021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40020,7 +39032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40034,11 +39046,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40049,7 +39061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40060,7 +39072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40071,7 +39083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40085,11 +39097,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40100,7 +39112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40114,11 +39126,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40129,7 +39141,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40143,12 +39155,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -40165,24 +39231,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -40194,7 +39242,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40216,7 +39264,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40238,7 +39286,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40249,7 +39297,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40263,7 +39311,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -40281,7 +39329,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -40296,7 +39344,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40307,7 +39355,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40321,11 +39369,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40336,7 +39384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40350,11 +39398,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40368,6 +39434,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -40405,7 +39489,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40416,7 +39500,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40427,7 +39511,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40438,7 +39522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40449,7 +39533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40460,7 +39544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40471,7 +39555,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40482,7 +39566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40522,7 +39606,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40533,7 +39617,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40544,7 +39628,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40555,7 +39639,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40566,7 +39650,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40577,7 +39661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40588,7 +39672,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40599,7 +39683,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40610,7 +39694,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40621,7 +39705,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40632,7 +39716,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40643,7 +39727,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40654,7 +39738,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40665,7 +39749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40676,7 +39760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40694,7 +39778,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40705,7 +39789,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40716,7 +39800,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40727,7 +39811,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40738,7 +39822,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40749,7 +39833,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40760,7 +39844,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40771,7 +39855,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40789,7 +39873,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40800,7 +39884,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40811,7 +39895,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40822,7 +39906,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40833,7 +39917,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40844,7 +39928,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40855,7 +39939,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -40873,7 +39957,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40891,7 +39975,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40920,7 +40004,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -40956,7 +40040,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40967,7 +40051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40985,7 +40069,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -41032,17 +40116,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -41052,7 +40125,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41070,8 +40143,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -41088,6 +40161,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -41102,11 +40211,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41120,7 +40229,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -41138,11 +40247,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41156,7 +40265,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -41174,29 +40283,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41210,11 +40301,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41228,7 +40319,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -41279,7 +40370,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -41308,94 +40399,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41413,7 +40421,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41431,7 +40439,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41449,7 +40457,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41467,7 +40475,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41485,23 +40493,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -41514,8 +40511,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -41532,25 +40529,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41564,40 +40543,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41611,11 +40561,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41629,7 +40579,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -41752,41 +40702,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -41804,7 +40728,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -41816,6 +40766,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -41823,8 +40792,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -41842,8 +40811,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -41861,8 +40830,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -41881,7 +40850,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -41900,7 +40869,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -41918,8 +40887,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -41928,7 +40897,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -41937,25 +40906,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -41963,26 +40913,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -41994,51 +40925,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -42046,8 +40932,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -42065,8 +40951,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -42079,133 +40965,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -42220,25 +40979,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -42256,7 +40997,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -42274,7 +41142,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -42292,11 +41160,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42310,11 +41178,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42328,7 +41196,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -42346,11 +41214,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42361,7 +41229,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42375,11 +41243,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42393,7 +41261,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -42477,7 +41345,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -42528,7 +41396,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -42546,7 +41414,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -42564,7 +41432,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -42582,11 +41450,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -42604,7 +41472,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42615,7 +41483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42626,7 +41494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42637,7 +41505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42688,7 +41556,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42699,7 +41567,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42710,7 +41578,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42721,7 +41589,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42761,7 +41629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42772,7 +41640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42783,7 +41651,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42794,7 +41662,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42841,7 +41709,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42852,7 +41720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42892,7 +41760,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42903,7 +41771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42957,7 +41825,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42975,7 +41843,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42993,7 +41861,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43022,7 +41890,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43051,7 +41919,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43062,7 +41930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43080,23 +41948,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -43109,10 +41977,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -43120,10 +41988,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -43138,7 +42024,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43149,7 +42086,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43160,7 +42097,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43171,7 +42108,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43182,7 +42119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43193,7 +42130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43229,7 +42166,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -43247,74 +42184,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -43331,7 +42206,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43340,6 +42215,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -43354,7 +42284,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43372,7 +42302,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43390,7 +42320,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43408,7 +42338,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43426,7 +42356,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43444,7 +42374,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43462,6 +42392,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -43487,11 +42482,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43502,7 +42497,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43513,7 +42508,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43524,7 +42519,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43538,99 +42533,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -43640,8 +42548,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -43658,7 +42566,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43672,11 +42667,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43687,7 +42682,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43698,7 +42693,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43709,7 +42704,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43723,7 +42718,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -43741,7 +42736,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -43759,29 +42754,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43795,29 +42772,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43835,7 +42794,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43853,7 +42812,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43871,7 +42830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43889,7 +42848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43956,7 +42915,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -43975,7 +42934,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -43994,7 +42953,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -44013,7 +42972,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -44058,7 +43017,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -44077,7 +43036,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -44096,7 +43055,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -44115,7 +43074,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -44160,7 +43119,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -44179,7 +43138,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -44198,7 +43157,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -44217,7 +43176,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -44231,7 +43190,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44249,7 +43208,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44267,61 +43226,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44332,7 +43237,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44343,7 +43248,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44354,7 +43259,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44368,11 +43273,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44383,7 +43288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44394,7 +43299,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44405,7 +43310,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44419,11 +43324,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44434,7 +43339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44448,11 +43353,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44463,7 +43368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44477,12 +43382,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -44499,24 +43458,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -44528,7 +43469,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44550,7 +43491,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44572,7 +43513,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44583,7 +43524,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44597,7 +43538,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -44615,7 +43556,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -44630,7 +43571,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44641,7 +43582,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44655,11 +43596,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44670,7 +43611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44684,11 +43625,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44702,6 +43661,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -44739,7 +43716,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44750,7 +43727,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44761,7 +43738,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44772,7 +43749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44783,7 +43760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44794,7 +43771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44805,7 +43782,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44816,7 +43793,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44856,7 +43833,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44867,7 +43844,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44878,7 +43855,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44889,7 +43866,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44900,7 +43877,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44911,7 +43888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44922,7 +43899,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44933,7 +43910,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44944,7 +43921,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44955,7 +43932,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44966,7 +43943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44977,7 +43954,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44988,7 +43965,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44999,7 +43976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45010,7 +43987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45028,7 +44005,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45039,7 +44016,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45050,7 +44027,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45061,7 +44038,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45072,7 +44049,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45083,7 +44060,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45094,7 +44071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45105,7 +44082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45123,7 +44100,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45134,7 +44111,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45145,7 +44122,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45156,7 +44133,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45167,7 +44144,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45178,7 +44155,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45189,7 +44166,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -45207,7 +44184,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45225,7 +44202,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45254,7 +44231,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45290,7 +44267,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -45301,7 +44278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -45319,7 +44296,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -45366,17 +44343,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -45386,7 +44352,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45404,8 +44370,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -45422,6 +44388,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -45436,11 +44438,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45454,7 +44456,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -45472,11 +44474,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45490,7 +44492,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -45508,29 +44510,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45544,11 +44528,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45562,7 +44546,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -45613,7 +44597,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -45642,94 +44626,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45747,7 +44648,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45765,7 +44666,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45783,7 +44684,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45801,7 +44702,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45819,23 +44720,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -45848,8 +44738,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -45866,25 +44756,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45898,40 +44770,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45945,11 +44788,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45963,7 +44806,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -46086,41 +44929,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -46138,7 +44955,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -46150,6 +44993,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -46157,8 +45019,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -46176,8 +45038,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -46195,8 +45057,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -46215,7 +45077,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -46234,7 +45096,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -46252,8 +45114,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -46262,7 +45124,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -46271,25 +45133,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -46297,26 +45140,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -46328,51 +45152,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -46380,8 +45159,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -46399,8 +45178,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -46413,133 +45192,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -46554,25 +45206,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -46590,7 +45224,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -46608,7 +45369,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -46626,11 +45387,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46644,11 +45405,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46662,7 +45423,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -46680,11 +45441,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46695,7 +45456,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46709,11 +45470,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46727,7 +45488,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -46811,7 +45572,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -46862,7 +45623,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -46880,7 +45641,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -46898,7 +45659,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -46916,11 +45677,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -46938,7 +45699,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46949,7 +45710,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46960,7 +45721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46971,7 +45732,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47022,7 +45783,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47033,7 +45794,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47044,7 +45805,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47055,7 +45816,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47095,7 +45856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47106,7 +45867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47117,7 +45878,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47128,7 +45889,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47175,7 +45936,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47186,7 +45947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47226,7 +45987,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47237,7 +45998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47291,7 +46052,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47309,7 +46070,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47327,7 +46088,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47356,7 +46117,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47385,7 +46146,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -47396,7 +46157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -47414,23 +46175,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -47443,10 +46204,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -47454,10 +46215,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -47472,7 +46251,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47483,7 +46313,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47494,7 +46324,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47505,7 +46335,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47516,7 +46346,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47527,7 +46357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47563,7 +46393,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -47581,74 +46411,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -47665,7 +46433,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47674,6 +46442,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -47688,7 +46511,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47706,7 +46529,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47724,7 +46547,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47742,7 +46565,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47760,7 +46583,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47778,7 +46601,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47796,6 +46619,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -47821,11 +46709,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47836,7 +46724,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47847,7 +46735,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47858,7 +46746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47872,99 +46760,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -47974,8 +46775,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -47992,7 +46793,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48006,11 +46894,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48021,7 +46909,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48032,7 +46920,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48043,7 +46931,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48057,7 +46945,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -48075,7 +46963,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -48093,29 +46981,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48129,29 +46999,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48169,7 +47021,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48187,7 +47039,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48205,7 +47057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48223,7 +47075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48290,7 +47142,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -48309,7 +47161,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -48328,7 +47180,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -48347,7 +47199,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -48392,7 +47244,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -48411,7 +47263,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -48430,7 +47282,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -48449,7 +47301,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -48494,7 +47346,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -48513,7 +47365,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -48532,7 +47384,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -48551,7 +47403,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -48565,7 +47417,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48583,7 +47435,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48601,61 +47453,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48666,7 +47464,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48677,7 +47475,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48688,7 +47486,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48702,11 +47500,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48717,7 +47515,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48728,7 +47526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48739,7 +47537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48753,11 +47551,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48768,7 +47566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48782,11 +47580,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48797,7 +47595,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48811,12 +47609,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -48833,24 +47685,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -48862,7 +47696,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48884,7 +47718,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48906,7 +47740,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48917,7 +47751,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48931,7 +47765,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -48949,7 +47783,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -48964,7 +47798,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48975,7 +47809,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48989,11 +47823,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49004,7 +47838,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49018,11 +47852,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49036,6 +47888,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -49073,7 +47943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49084,7 +47954,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49095,7 +47965,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49106,7 +47976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49117,7 +47987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49128,7 +47998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49139,7 +48009,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49150,7 +48020,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49190,7 +48060,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49201,7 +48071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49212,7 +48082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49223,7 +48093,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49234,7 +48104,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49245,7 +48115,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49256,7 +48126,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49267,7 +48137,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49278,7 +48148,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49289,7 +48159,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49300,7 +48170,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49311,7 +48181,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49322,7 +48192,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49333,7 +48203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49344,7 +48214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49362,7 +48232,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49373,7 +48243,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49384,7 +48254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49395,7 +48265,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49406,7 +48276,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49417,7 +48287,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49428,7 +48298,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49439,7 +48309,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49457,7 +48327,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49468,7 +48338,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49479,7 +48349,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49490,7 +48360,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49501,7 +48371,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49512,7 +48382,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49523,7 +48393,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -49541,7 +48411,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49559,7 +48429,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49588,7 +48458,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -49624,7 +48494,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49635,7 +48505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49653,7 +48523,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -49700,17 +48570,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -49720,7 +48579,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49738,8 +48597,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -49756,6 +48615,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -49770,11 +48665,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49788,7 +48683,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -49806,11 +48701,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49824,7 +48719,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -49842,29 +48737,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49878,11 +48755,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49896,7 +48773,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -49947,7 +48824,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -49976,94 +48853,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50081,7 +48875,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50099,7 +48893,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50117,7 +48911,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50135,7 +48929,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50153,23 +48947,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -50182,8 +48965,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -50200,25 +48983,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50232,40 +48997,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50279,11 +49015,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50297,7 +49033,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -50420,41 +49156,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -50472,7 +49182,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -50484,6 +49220,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -50491,8 +49246,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -50510,8 +49265,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -50529,8 +49284,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -50549,7 +49304,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -50568,7 +49323,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -50586,8 +49341,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -50596,7 +49351,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -50605,25 +49360,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -50631,26 +49367,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -50662,51 +49379,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -50714,8 +49386,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -50733,8 +49405,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -50747,133 +49419,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -50888,25 +49433,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -50924,7 +49451,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -50942,7 +49596,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -50960,11 +49614,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -50978,11 +49632,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -50996,7 +49650,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -51014,11 +49668,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51029,7 +49683,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51043,11 +49697,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51061,7 +49715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -51145,7 +49799,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -51196,7 +49850,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -51214,7 +49868,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -51232,7 +49886,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -51250,11 +49904,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -51272,7 +49926,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51283,7 +49937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51294,7 +49948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51305,7 +49959,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51356,7 +50010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51367,7 +50021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51378,7 +50032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51389,7 +50043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51429,7 +50083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51440,7 +50094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51451,7 +50105,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51462,7 +50116,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51509,7 +50163,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51520,7 +50174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51560,7 +50214,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51571,7 +50225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51625,7 +50279,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51643,7 +50297,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51661,7 +50315,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51690,7 +50344,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51719,7 +50373,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -51730,7 +50384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -51748,23 +50402,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -51777,10 +50431,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -51788,10 +50442,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -51806,7 +50478,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51817,7 +50540,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51828,7 +50551,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51839,7 +50562,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51850,7 +50573,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51861,7 +50584,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51897,7 +50620,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -51915,74 +50638,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -51999,7 +50660,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -52008,6 +50669,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -52047,7 +50763,7 @@
               {
                 "action_name": "act_0",
                 "action_handle": 536870914,
-                "table_name": "tbl_act_17",
+                "table_name": "tbl_act_15",
                 "next_table": 0,
                 "next_table_full": 16,
                 "vliw_instruction": 1,
@@ -52086,7 +50802,15 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W8" },
+              "src": [
+                { "type": "phv", "name": "W6" },
+                { "type": "phv", "name": "W7" }
               ]
             }
           ]
@@ -52109,7 +50833,7 @@
     {
       "direction": "egress",
       "handle": 16777218,
-      "name": "tbl_act_14",
+      "name": "tbl_act_13",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -52168,7 +50892,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 3 ],
+            "result_physical_buses": [ 2 ],
             "ternary_indirection_stage_table": {
               "stage_number": 0,
               "stage_table_type": "ternary_indirection",
@@ -52586,9 +51310,9 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "act_14",
+                  "action_name": "act_13",
                   "action_handle": 536870915,
-                  "table_name": "tbl_act_32",
+                  "table_name": "cond-19",
                   "next_table": 0,
                   "next_table_full": 2,
                   "vliw_instruction": 0,
@@ -52633,7 +51357,7 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "act_14",
+          "name": "act_13",
           "handle": 536870915,
           "indirect_resources": [],
           "allowed_as_default_action": true,
@@ -52653,10 +51377,10 @@
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
+              "dst": { "type": "phv", "name": "B26" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B28" }
+                { "type": "phv", "name": "B26" }
               ]
             }
           ]
@@ -52673,95 +51397,6 @@
     {
       "direction": "egress",
       "handle": 16777219,
-      "name": "tbl_act_15",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_15",
-                "action_handle": 536870916,
-                "table_name": "cond-20",
-                "next_table": 0,
-                "next_table_full": 3,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_15",
-          "handle": 536870916,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.dscp" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B21" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870916,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777220,
       "name": "tbl_int_egress_int_hop_cnt_increment",
       "table_type": "match",
       "size": 1,
@@ -52772,7 +51407,7 @@
             "stage_number": 0,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 4,
+            "logical_table_id": 3,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -52788,12 +51423,12 @@
             "action_format": [
               {
                 "action_name": "int_egress.int_hop_cnt_increment",
-                "action_handle": 536870917,
+                "action_handle": 536870916,
                 "table_name": "tbl_int_egress_int_hop_cnt_exceeded_0",
                 "next_table": 0,
-                "next_table_full": 7,
+                "next_table_full": 6,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
+                "vliw_instruction_full": 65,
                 "immediate_fields": []
               }
             ],
@@ -52806,7 +51441,7 @@
       "actions": [
         {
           "name": "int_egress.int_hop_cnt_increment",
-          "handle": 536870917,
+          "handle": 536870916,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -52835,6 +51470,109 @@
           ]
         }
       ],
+      "default_action_handle": 536870916,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": [],
+      "performs_hash_action": false,
+      "action_data_table_refs": [],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": []
+    },
+    {
+      "direction": "egress",
+      "handle": 16777220,
+      "name": "tbl_int_egress_int_transit",
+      "table_type": "match",
+      "size": 1,
+      "preferred_match_type": "exact",
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 0,
+            "size": 1,
+            "stage_table_type": "match_with_no_key",
+            "logical_table_id": 4,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "memory_resource_allocation": null,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 0,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0
+              }
+            ],
+            "result_physical_buses": [ 2 ],
+            "action_format": [
+              {
+                "action_name": "int_egress.int_transit",
+                "action_handle": 536870917,
+                "table_name": "tbl_int_egress_int_metadata_insert_int_set_header_0407_i12_0",
+                "next_table": 0,
+                "next_table_full": 5,
+                "vliw_instruction": 1,
+                "vliw_instruction_full": 66,
+                "immediate_fields": []
+              }
+            ],
+            "hash_functions": []
+          }
+        ],
+        "match_type": "match_with_no_key",
+        "uses_dynamic_key_masks": false
+      },
+      "actions": [
+        {
+          "name": "int_egress.int_transit",
+          "handle": 536870917,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
+              "src": [ { "immediate": "100" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operator": "shl",
+              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
+              "src": [
+                { "type": "phv", "name": "H20" },
+                { "type": "phv", "name": "H20" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B17" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "B16" }
+              ]
+            }
+          ]
+        }
+      ],
       "default_action_handle": 536870917,
       "action_profile": "",
       "default_next_table_mask": 0,
@@ -52852,7 +51590,7 @@
     {
       "direction": "egress",
       "handle": 16777221,
-      "name": "int_egress.int_prep",
+      "name": "tbl_int_egress_int_metadata_insert_int_set_header_0407_i12",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -52862,7 +51600,7 @@
             "size": 512,
             "stage_table_type": "ternary_match",
             "logical_table_id": 5,
-            "default_next_table": 6,
+            "default_next_table": 1,
             "has_attached_gateway": false,
             "pack_format": [
               {
@@ -52911,7 +51649,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "ternary_indirection_stage_table": {
               "stage_number": 0,
               "stage_table_type": "ternary_indirection",
@@ -52920,41 +51658,181 @@
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 8,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 123,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 107,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 91,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 64,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 75,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 59,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 43,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
                       "entry_number": 1,
                       "fields": [
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 11,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 65,
+                          "lsb_mem_word_offset": 16,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 31,
+                          "field_width": 5,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "--padding_33_63--"
+                          "lsb_mem_word_offset": 27,
+                          "field_name": "--padding_11_15--"
                         }
                       ]
                     },
@@ -52964,32 +51842,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 11,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 1,
+                          "lsb_mem_word_offset": 0,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 31,
+                          "field_width": 5,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "--padding_33_63--"
+                          "lsb_mem_word_offset": 11,
+                          "field_name": "--padding_11_15--"
                         }
                       ]
                     }
@@ -52999,30 +51867,37 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "NoAction",
-                  "action_handle": 536870919,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
-                  "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 68,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "int_egress.int_transit",
+                  "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
                   "action_handle": 536870918,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
+                  "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
                   "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 1,
+                  "next_table_full": 17,
+                  "vliw_instruction": 0,
                   "vliw_instruction_full": 67,
                   "immediate_fields": [
                     {
-                      "param_name": "switch_id",
-                      "param_type": "parameter",
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
                       "param_shift": 0,
                       "dest_start": 0,
-                      "dest_width": 32
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 2,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_5",
+                      "param_type": "constant",
+                      "const_value": 5,
+                      "param_shift": 0,
+                      "dest_start": 8,
+                      "dest_width": 3
                     }
                   ]
                 }
@@ -53039,8 +51914,8 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "NoAction",
-          "handle": 536870919,
+          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
+          "handle": 536870918,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -53056,60 +51931,33 @@
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
           "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_transit",
-          "handle": 536870918,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "switch_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
-              "src": [ { "type": "immediate", "name": "switch_id" } ]
+              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
+              "src": [ { "type": "phv", "name": "W19" } ]
             },
             {
               "name": "DirectAluPrimitive",
-              "operator": "shl",
-              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
+              "operation": "bitmasked-set",
+              "dst": { "type": "phv", "name": "B27" },
               "src": [
-                { "type": "phv", "name": "H18" },
-                { "type": "phv", "name": "H18" }
+                { "type": "immediate", "name": "$data0" },
+                { "type": "phv", "name": "B27" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B17" },
+              "dst": { "type": "phv", "name": "W18" },
               "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "B16" }
+                { "type": "phv", "name": "W16" },
+                { "type": "phv", "name": "W17" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870919,
+      "default_action_handle": 536870918,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -53120,4117 +51968,6 @@
     {
       "direction": "egress",
       "handle": 16777222,
-      "name": "int_egress.int_metadata_insert.int_inst_0407",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554433,
-          "name": "int_egress_int_metadata_insert_int_inst_0$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870920,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0407",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0407"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 6,
-            "default_next_table": 17,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-                "action_handle": 536870920,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-                "action_handle": 536870921,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-                "action_handle": 536870922,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-                "action_handle": 536870923,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_65",
-                    "param_type": "constant",
-                    "const_value": 65,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-                "action_handle": 536870924,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-                "action_handle": 536870925,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-                "action_handle": 536870926,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_66",
-                    "param_type": "constant",
-                    "const_value": 66,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-                "action_handle": 536870927,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_67",
-                    "param_type": "constant",
-                    "const_value": 67,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-                "action_handle": 536870928,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-                "action_handle": 536870929,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-                "action_handle": 536870930,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_80",
-                    "param_type": "constant",
-                    "const_value": 80,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-                "action_handle": 536870931,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_81",
-                    "param_type": "constant",
-                    "const_value": 81,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-                "action_handle": 536870932,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-                "action_handle": 536870933,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-                "action_handle": 536870934,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_82",
-                    "param_type": "constant",
-                    "const_value": 82,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-                "action_handle": 536870935,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 32,
-                "vliw_instruction_full": 96,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_83",
-                    "param_type": "constant",
-                    "const_value": 83,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 0,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 15,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 91,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 21,
-                            "field_name": "--padding_21_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 33554433,
-      "name": "int_egress_int_metadata_insert_int_inst_0$action",
-      "table_type": "action",
-      "size": 4096,
-      "stage_tables": [
-        {
-          "stage_number": 0,
-          "size": 4096,
-          "stage_table_type": "action_data",
-          "logical_table_id": 6,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870920
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870921
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870922
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870923
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870924
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870925
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870926
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870927
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870928
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870929
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870930
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870931
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870932
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870933
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870934
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870935
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777223,
       "name": "tbl_int_egress_int_hop_cnt_exceeded",
       "table_type": "match",
       "size": 1,
@@ -57241,7 +51978,7 @@
             "stage_number": 0,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 7,
+            "logical_table_id": 6,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57257,12 +51994,12 @@
             "action_format": [
               {
                 "action_name": "int_egress.int_hop_cnt_exceeded",
-                "action_handle": 536870936,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
+                "action_handle": 536870919,
+                "table_name": "tbl_act_27",
                 "next_table": 0,
                 "next_table_full": 21,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 71,
+                "vliw_instruction_full": 68,
                 "immediate_fields": []
               }
             ],
@@ -57275,7 +52012,7 @@
       "actions": [
         {
           "name": "int_egress.int_hop_cnt_exceeded",
-          "handle": 536870936,
+          "handle": 536870919,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57297,13 +52034,13 @@
               "dst": { "type": "phv", "name": "int_header.e" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H18" }
+                { "type": "phv", "name": "H20" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870936,
+      "default_action_handle": 536870919,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57319,7 +52056,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777224,
+      "handle": 16777223,
       "name": "tbl_act_0",
       "table_type": "match",
       "size": 1,
@@ -57346,8 +52083,8 @@
             "action_format": [
               {
                 "action_name": "act",
-                "action_handle": 536870937,
-                "table_name": "tbl_act_18",
+                "action_handle": 536870920,
+                "table_name": "tbl_act_16",
                 "next_table": 0,
                 "next_table_full": 32,
                 "vliw_instruction": 1,
@@ -57364,7 +52101,7 @@
       "actions": [
         {
           "name": "act",
-          "handle": 536870937,
+          "handle": 536870920,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57394,13 +52131,103 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870937,
+      "default_action_handle": 536870920,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": [],
+      "performs_hash_action": false,
+      "action_data_table_refs": [],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": []
+    },
+    {
+      "direction": "egress",
+      "handle": 16777224,
+      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
+      "table_type": "match",
+      "size": 1,
+      "preferred_match_type": "exact",
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 1,
+            "size": 1,
+            "stage_table_type": "match_with_no_key",
+            "logical_table_id": 1,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "memory_resource_allocation": null,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 0,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0
+              }
+            ],
+            "result_physical_buses": [ 2 ],
+            "action_format": [
+              {
+                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
+                "action_handle": 536870921,
+                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
+                "next_table": 0,
+                "next_table_full": 18,
+                "vliw_instruction": 1,
+                "vliw_instruction_full": 64,
+                "immediate_fields": []
+              }
+            ],
+            "hash_functions": []
+          }
+        ],
+        "match_type": "match_with_no_key",
+        "uses_dynamic_key_masks": false
+      },
+      "actions": [
+        {
+          "name": "int_egress.int_outer_encap.int_update_ipv4",
+          "handle": 536870921,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "ipv4.total_len" },
+              "src": [
+                { "type": "phv", "name": "H21" },
+                { "type": "phv", "name": "H19" }
+              ]
+            }
+          ]
+        }
+      ],
+      "default_action_handle": 536870921,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57427,7 +52254,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
+            "logical_table_id": 2,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57439,16 +52266,16 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
                 "action_name": "int_egress.int_outer_encap.int_update_shim",
-                "action_handle": 536870938,
+                "action_handle": 536870922,
                 "table_name": "tbl_int_egress_int_outer_encap_int_update_udp_0",
                 "next_table": 0,
-                "next_table_full": 18,
+                "next_table_full": 19,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
+                "vliw_instruction_full": 65,
                 "immediate_fields": []
               }
             ],
@@ -57461,7 +52288,7 @@
       "actions": [
         {
           "name": "int_egress.int_outer_encap.int_update_shim",
-          "handle": 536870938,
+          "handle": 536870922,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57490,7 +52317,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870938,
+      "default_action_handle": 536870922,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57517,7 +52344,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
+            "logical_table_id": 3,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57529,16 +52356,16 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 1 ],
+            "result_physical_buses": [ 0 ],
             "action_format": [
               {
                 "action_name": "int_egress.int_outer_encap.int_update_udp",
-                "action_handle": 536870939,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
+                "action_handle": 536870923,
+                "table_name": "tbl_int_egress_int_metadata_insert_int_set_header_0003_i13_0",
                 "next_table": 0,
-                "next_table_full": 19,
+                "next_table_full": 20,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
+                "vliw_instruction_full": 66,
                 "immediate_fields": []
               }
             ],
@@ -57551,7 +52378,7 @@
       "actions": [
         {
           "name": "int_egress.int_outer_encap.int_update_udp",
-          "handle": 536870939,
+          "handle": 536870923,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57573,8 +52400,8 @@
               "operation": "add",
               "dst": { "type": "phv", "name": "udp.len" },
               "src": [
-                { "type": "phv", "name": "H16" },
-                { "type": "phv", "name": "H17" }
+                { "type": "phv", "name": "H18" },
+                { "type": "phv", "name": "H19" }
               ]
             },
             {
@@ -57585,7 +52412,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870939,
+      "default_action_handle": 536870923,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57602,1530 +52429,7 @@
     {
       "direction": "egress",
       "handle": 16777227,
-      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 3,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
-                "action_handle": 536870940,
-                "table_name": "int_egress_int_metadata_insert_int_inst",
-                "next_table": 0,
-                "next_table_full": 20,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_outer_encap.int_update_ipv4",
-          "handle": 536870940,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [
-                { "type": "phv", "name": "H19" },
-                { "type": "phv", "name": "H17" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870940,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777228,
-      "name": "int_egress.int_metadata_insert.int_inst_0003",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870941,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0003",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0003"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 21,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-                "action_handle": 536870941,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 3,
-                "vliw_instruction_full": 67,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-                "action_handle": 536870942,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-                "action_handle": 536870949,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-                "action_handle": 536870943,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-                "action_handle": 536870944,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-                "action_handle": 536870945,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-                "action_handle": 536870946,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-                "action_handle": 536870947,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-                "action_handle": 536870948,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-                "action_handle": 536870950,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-                "action_handle": 536870951,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-                "action_handle": 536870952,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-                "action_handle": 536870953,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-                "action_handle": 536870954,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-                "action_handle": 536870955,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-                "action_handle": 536870956,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 1,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 16,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 90,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 22,
-                            "field_name": "--padding_22_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-          "handle": 536870941,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-          "handle": 536870942,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-          "handle": 536870949,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-          "handle": 536870943,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-          "handle": 536870944,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-          "handle": 536870945,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-          "handle": 536870946,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-          "handle": 536870947,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-          "handle": 536870948,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-          "handle": 536870950,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-          "handle": 536870951,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-          "handle": 536870952,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-          "handle": 536870953,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-          "handle": 536870954,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-          "handle": 536870955,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-          "handle": 536870956,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 16777229,
-      "name": "tbl_spgw_egress_gtpu_encap",
+      "name": "tbl_int_egress_int_metadata_insert_int_set_header_0003_i13",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -59134,9 +52438,9 @@
             "stage_number": 1,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 5,
-            "default_next_table": 6,
-            "has_attached_gateway": true,
+            "logical_table_id": 4,
+            "default_next_table": 5,
+            "has_attached_gateway": false,
             "pack_format": [
               {
                 "table_word_width": 0,
@@ -59202,32 +52506,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 121,
+                          "lsb_mem_word_offset": 120,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 127,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59237,32 +52531,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 113,
+                          "lsb_mem_word_offset": 112,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 119,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59272,32 +52556,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 105,
+                          "lsb_mem_word_offset": 104,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 111,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59307,32 +52581,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 97,
+                          "lsb_mem_word_offset": 96,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 103,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59342,32 +52606,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 89,
+                          "lsb_mem_word_offset": 88,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 95,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59377,32 +52631,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 81,
+                          "lsb_mem_word_offset": 80,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 87,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59412,32 +52656,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 73,
+                          "lsb_mem_word_offset": 72,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 79,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59447,32 +52681,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 65,
+                          "lsb_mem_word_offset": 64,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 71,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59482,32 +52706,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 57,
+                          "lsb_mem_word_offset": 56,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 63,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59517,32 +52731,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 49,
+                          "lsb_mem_word_offset": 48,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 55,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59552,32 +52756,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 41,
+                          "lsb_mem_word_offset": 40,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 47,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59587,32 +52781,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 33,
+                          "lsb_mem_word_offset": 32,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 39,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59622,32 +52806,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 25,
+                          "lsb_mem_word_offset": 24,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 31,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59657,32 +52831,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 17,
+                          "lsb_mem_word_offset": 16,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 23,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59692,32 +52856,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 9,
+                          "lsb_mem_word_offset": 8,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 15,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59727,32 +52881,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 1,
+                          "lsb_mem_word_offset": 0,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 7,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     }
@@ -59762,13 +52906,13 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "spgw_egress.gtpu_encap",
-                  "action_handle": 536870957,
-                  "table_name": "tbl_act_30",
+                  "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
+                  "action_handle": 536870924,
+                  "table_name": "tbl_act_27",
                   "next_table": 0,
-                  "next_table_full": 22,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 71,
+                  "next_table_full": 21,
+                  "vliw_instruction": 0,
+                  "vliw_instruction_full": 67,
                   "immediate_fields": [
                     {
                       "param_name": "constant_1",
@@ -59783,7 +52927,7 @@
                       "param_type": "constant",
                       "const_value": 1,
                       "param_shift": 0,
-                      "dest_start": 5,
+                      "dest_start": 3,
                       "dest_width": 1
                     },
                     {
@@ -59791,7 +52935,7 @@
                       "param_type": "constant",
                       "const_value": 1,
                       "param_shift": 0,
-                      "dest_start": 3,
+                      "dest_start": 5,
                       "dest_width": 1
                     }
                   ]
@@ -59802,21 +52946,15 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554434,
-          "name": "tbl_spgw_egress_gtpu_encap_0$action"
-        }
-      ],
+      "action_data_table_refs": [],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
+          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
+          "handle": 536870924,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -59831,87 +52969,59 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
           "primitives": [
             {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
               "src": [ { "type": "immediate", "name": "0" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
+              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
+              "src": [ { "type": "phv", "name": "W28" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
+              "src": [ { "type": "phv", "name": "B21" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
               "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
+                { "type": "phv", "name": "H33" },
+                { "type": "phv", "name": "H34" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
+              "dst": { "type": "phv", "name": "B27" },
+              "src": [
+                { "type": "immediate", "name": "$data0" },
+                { "type": "phv", "name": "B27" }
+              ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
+              "dst": { "type": "phv", "name": "H24" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "H23" }
+              ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
+              "dst": { "type": "phv", "name": "H25" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "H26" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870957,
+      "default_action_handle": 536870924,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -59921,334 +53031,8 @@
     },
     {
       "direction": "egress",
-      "handle": 33554434,
-      "name": "tbl_spgw_egress_gtpu_encap_0$action",
-      "table_type": "action",
-      "size": 1024,
-      "stage_tables": [
-        {
-          "stage_number": 1,
-          "size": 1024,
-          "stage_table_type": "action_data",
-          "logical_table_id": 5,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$constant10"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant11"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 45,
-                      "field_name": "$constant5"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 44,
-                      "field_name": "$constant6"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 43,
-                      "field_name": "$constant7"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 42,
-                      "field_name": "$constant8"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "$constant9"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 60,
-                      "field_name": "$constant12"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant13"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 6,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
-                      "lsb_mem_word_offset": 50,
-                      "field_name": "$constant14"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "$constant15"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 93,
-                      "field_name": "$constant16"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 13,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "$constant17"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$constant18"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant19"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "$constant20"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant21"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870957
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
-              "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777230,
-      "name": "tbl_act_13",
+      "handle": 16777228,
+      "name": "tbl_act_12",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -60258,7 +53042,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
+            "logical_table_id": 5,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -60273,13 +53057,13 @@
             "result_physical_buses": [ 4 ],
             "action_format": [
               {
-                "action_name": "act_13",
-                "action_handle": 536870958,
-                "table_name": "--END_OF_PIPELINE--",
+                "action_name": "act_12",
+                "action_handle": 536870925,
+                "table_name": "tbl_spgw_egress_gtpu_encap_0",
                 "next_table": 0,
-                "next_table_full": 255,
+                "next_table_full": 35,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 73,
+                "vliw_instruction_full": 68,
                 "immediate_fields": []
               }
             ],
@@ -60291,8 +53075,8 @@
       },
       "actions": [
         {
-          "name": "act_13",
-          "handle": 536870958,
+          "name": "act_12",
+          "handle": 536870925,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60314,21 +53098,21 @@
               "dst": { "type": "phv", "name": "packet_in.$valid" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B30" }
+                { "type": "phv", "name": "B26" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "packet_in.ingress_port" },
               "src": [
-                { "type": "phv", "name": "H27" },
-                { "type": "phv", "name": "H28" }
+                { "type": "phv", "name": "H26" },
+                { "type": "phv", "name": "H27" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870958,
+      "default_action_handle": 536870925,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60344,7 +53128,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777231,
+      "handle": 16777229,
       "name": "tbl_act_1",
       "table_type": "match",
       "size": 512,
@@ -60563,8 +53347,8 @@
               "action_format": [
                 {
                   "action_name": "act_4",
-                  "action_handle": 536870959,
-                  "table_name": "tbl_act_19",
+                  "action_handle": 536870926,
+                  "table_name": "tbl_act_17",
                   "next_table": 0,
                   "next_table_full": 33,
                   "vliw_instruction": 1,
@@ -60610,7 +53394,7 @@
       "actions": [
         {
           "name": "act_4",
-          "handle": 536870959,
+          "handle": 536870926,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60630,16 +53414,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870959,
+      "default_action_handle": 536870926,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60649,7 +53433,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777232,
+      "handle": 16777230,
       "name": "tbl_act_2",
       "table_type": "match",
       "size": 1,
@@ -60676,7 +53460,7 @@
             "action_format": [
               {
                 "action_name": "act_2",
-                "action_handle": 536870960,
+                "action_handle": 536870927,
                 "table_name": "spgw_ingress_ue_filter_table",
                 "next_table": 0,
                 "next_table_full": 34,
@@ -60694,7 +53478,7 @@
       "actions": [
         {
           "name": "act_2",
-          "handle": 536870960,
+          "handle": 536870927,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60724,12 +53508,12 @@
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [ { "type": "phv", "name": "H3" } ]
+              "src": [ { "type": "phv", "name": "H8" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ipv4.identification" },
-              "src": [ { "type": "phv", "name": "H9" } ]
+              "src": [ { "type": "phv", "name": "H6" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
@@ -60769,28 +53553,28 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H6" },
-              "src": [ { "type": "phv", "name": "H5" } ]
+              "dst": { "type": "phv", "name": "H3" },
+              "src": [ { "type": "phv", "name": "H2" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H8" },
-              "src": [ { "type": "phv", "name": "H7" } ]
+              "dst": { "type": "phv", "name": "H5" },
+              "src": [ { "type": "phv", "name": "H4" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W9" },
-              "src": [ { "type": "phv", "name": "W8" } ]
+              "dst": { "type": "phv", "name": "W12" },
+              "src": [ { "type": "phv", "name": "W11" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W11" },
-              "src": [ { "type": "phv", "name": "W10" } ]
+              "dst": { "type": "phv", "name": "W14" },
+              "src": [ { "type": "phv", "name": "W13" } ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870960,
+      "default_action_handle": 536870927,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60806,7 +53590,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777233,
+      "handle": 16777231,
       "name": "spgw_ingress.ue_filter_table",
       "table_type": "match",
       "size": 512,
@@ -61707,8 +54491,8 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870961,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870928,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -61729,7 +54513,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870961,
+          "handle": 536870928,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -61748,7 +54532,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870961,
+      "default_action_handle": 536870928,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -61769,8 +54553,1131 @@
       ]
     },
     {
+      "direction": "egress",
+      "handle": 16777232,
+      "name": "tbl_spgw_egress_gtpu_encap",
+      "table_type": "match",
+      "size": 512,
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 2,
+            "size": 512,
+            "stage_table_type": "ternary_match",
+            "logical_table_id": 3,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 47,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0,
+                "entries": [
+                  {
+                    "entry_number": 0,
+                    "fields": [
+                      {
+                        "field_name": "--tcam_payload_0--",
+                        "lsb_mem_word_offset": 0,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "payload",
+                        "start_bit": 0,
+                        "field_width": 1
+                      },
+                      {
+                        "field_name": "--tcam_parity_0--",
+                        "lsb_mem_word_offset": 45,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "parity",
+                        "start_bit": 0,
+                        "field_width": 2
+                      },
+                      {
+                        "field_name": "--unused--",
+                        "lsb_mem_word_offset": 1,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "zero",
+                        "start_bit": 0,
+                        "field_width": 41
+                      }
+                    ]
+                  }
+                ]
+              }
+            ],
+            "memory_resource_allocation": {
+              "memory_type": "tcam",
+              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
+              "spare_bank_memory_unit": 0
+            },
+            "result_physical_buses": [ 3 ],
+            "ternary_indirection_stage_table": {
+              "stage_number": 2,
+              "stage_table_type": "ternary_indirection",
+              "size": 512,
+              "pack_format": [
+                {
+                  "memory_word_width": 128,
+                  "table_word_width": 128,
+                  "entries_per_table_word": 16,
+                  "number_memory_units_per_table_word": 1,
+                  "entries": [
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 121,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 127,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 113,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 119,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 105,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 111,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 97,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 103,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 89,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 95,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 81,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 87,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 73,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 79,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 64,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 65,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 71,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 57,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 63,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 49,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 55,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 41,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 47,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 33,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 39,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 25,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 31,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 17,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 23,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 9,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 15,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 0,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 0,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 1,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 7,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
+              "action_format": [
+                {
+                  "action_name": "spgw_egress.gtpu_encap",
+                  "action_handle": 536870929,
+                  "table_name": "--END_OF_PIPELINE--",
+                  "next_table": 0,
+                  "next_table_full": 255,
+                  "vliw_instruction": 1,
+                  "vliw_instruction_full": 64,
+                  "immediate_fields": [
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 4,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 5,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 3,
+                      "dest_width": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        ],
+        "match_type": "ternary"
+      },
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554433,
+          "name": "tbl_spgw_egress_gtpu_encap_0$action"
+        }
+      ],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": [],
+      "actions": [
+        {
+          "name": "spgw_egress.gtpu_encap",
+          "handle": 536870929,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
+              "src": [
+                { "type": "action_param", "name": "$constant4" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
+              "src": [ { "immediate": "5395" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
+              "src": [ { "type": "phv", "name": "W25" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
+              "src": [ { "type": "phv", "name": "W23" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_udp.len" },
+              "src": [
+                { "type": "action_param", "name": "$constant3" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "src": [ { "type": "immediate", "name": "0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.msglen" },
+              "src": [ { "type": "phv", "name": "H21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.teid" },
+              "src": [ { "type": "phv", "name": "W21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B26" },
+              "src": [
+                { "type": "immediate", "name": "$data4" },
+                { "type": "phv", "name": "B26" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H29" },
+              "src": [ { "type": "action_param", "name": "$data0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H30" },
+              "src": [ { "type": "action_param", "name": "$data1" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W29" },
+              "src": [ { "type": "action_param", "name": "$data2" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W30" },
+              "src": [ { "type": "action_param", "name": "$data3" } ]
+            }
+          ]
+        }
+      ],
+      "default_action_handle": 536870929,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": []
+    },
+    {
+      "direction": "egress",
+      "handle": 33554433,
+      "name": "tbl_spgw_egress_gtpu_encap_0$action",
+      "table_type": "action",
+      "size": 1024,
+      "stage_tables": [
+        {
+          "stage_number": 2,
+          "size": 1024,
+          "stage_table_type": "action_data",
+          "logical_table_id": 3,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 1,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "$constant3"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "$constant4"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 40,
+                      "field_name": "$constant10"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "$constant11"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 3,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
+                      "lsb_mem_word_offset": 45,
+                      "field_name": "$constant5"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 44,
+                      "field_name": "$constant6"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 43,
+                      "field_name": "$constant7"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 42,
+                      "field_name": "$constant8"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 41,
+                      "field_name": "$constant9"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
+                      "lsb_mem_word_offset": 60,
+                      "field_name": "$constant12"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
+                      "lsb_mem_word_offset": 56,
+                      "field_name": "$constant13"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 6,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
+                      "lsb_mem_word_offset": 50,
+                      "field_name": "$constant14"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 2,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "$constant15"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 3,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
+                      "lsb_mem_word_offset": 93,
+                      "field_name": "$constant16"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 13,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "$constant17"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 72,
+                      "field_name": "$constant18"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "$constant19"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "$constant20"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "$constant21"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870929
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 90
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "spgw_egress.gtpu_encap",
+          "handle": 536870929,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
+              "src": [
+                { "type": "action_param", "name": "$constant4" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
+              "src": [ { "immediate": "5395" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
+              "src": [ { "type": "phv", "name": "W25" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
+              "src": [ { "type": "phv", "name": "W23" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_udp.len" },
+              "src": [
+                { "type": "action_param", "name": "$constant3" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "src": [ { "type": "immediate", "name": "0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.msglen" },
+              "src": [ { "type": "phv", "name": "H21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.teid" },
+              "src": [ { "type": "phv", "name": "W21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B26" },
+              "src": [
+                { "type": "immediate", "name": "$data4" },
+                { "type": "phv", "name": "B26" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H29" },
+              "src": [ { "type": "action_param", "name": "$data0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H30" },
+              "src": [ { "type": "action_param", "name": "$data1" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W29" },
+              "src": [ { "type": "action_param", "name": "$data2" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W30" },
+              "src": [ { "type": "action_param", "name": "$data3" } ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
       "direction": "ingress",
-      "handle": 16777234,
+      "handle": 16777233,
       "name": "spgw_ingress.s1u_filter_table",
       "table_type": "match",
       "size": 3072,
@@ -61779,7 +55686,7 @@
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
-      "default_action_handle": 536870962,
+      "default_action_handle": 536870930,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -64097,8 +58004,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870962,
-                "table_name": "tbl_act_22",
+                "action_handle": 536870930,
+                "table_name": "tbl_act_20",
                 "next_table": 0,
                 "next_table_full": 64,
                 "vliw_instruction": 0,
@@ -64492,7 +58399,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870962,
+          "handle": 536870930,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -64513,7 +58420,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777235,
+      "handle": 16777234,
       "name": "tbl_act_3",
       "table_type": "match",
       "size": 512,
@@ -64692,8 +58599,8 @@
               "action_format": [
                 {
                   "action_name": "act_1",
-                  "action_handle": 536870963,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870931,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -64739,7 +58646,7 @@
       "actions": [
         {
           "name": "act_1",
-          "handle": 536870963,
+          "handle": 536870931,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -64759,16 +58666,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870963,
+      "default_action_handle": 536870931,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -64778,7 +58685,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777236,
+      "handle": 16777235,
       "name": "tbl_act_4",
       "table_type": "match",
       "size": 512,
@@ -64957,8 +58864,8 @@
               "action_format": [
                 {
                   "action_name": "act_3",
-                  "action_handle": 536870964,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870932,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -65004,7 +58911,7 @@
       "actions": [
         {
           "name": "act_3",
-          "handle": 536870964,
+          "handle": 536870932,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -65024,16 +58931,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870964,
+      "default_action_handle": 536870932,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -65043,7 +58950,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777237,
+      "handle": 16777236,
       "name": "tbl_act_5",
       "table_type": "match",
       "size": 1,
@@ -65070,7 +58977,7 @@
             "action_format": [
               {
                 "action_name": "act_5",
-                "action_handle": 536870965,
+                "action_handle": 536870933,
                 "table_name": "cond-5",
                 "next_table": 0,
                 "next_table_full": 80,
@@ -65088,7 +58995,7 @@
       "actions": [
         {
           "name": "act_5",
-          "handle": 536870965,
+          "handle": 536870933,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -65110,13 +59017,13 @@
               "dst": { "type": "phv", "name": "spgw_ingress_hasReturned" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870965,
+      "default_action_handle": 536870933,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -65132,14 +59039,14 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777238,
+      "handle": 16777237,
       "name": "spgw_ingress.dl_sess_lookup",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554435,
+          "handle": 33554434,
           "name": "spgw_ingress_dl_sess_lookup$action"
         }
       ],
@@ -65147,7 +59054,7 @@
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
-      "default_action_handle": 536870967,
+      "default_action_handle": 536870935,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -67615,7 +61522,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870967,
+                "action_handle": 536870935,
                 "table_name": "tbl_spgw_ingress_drop_now_0",
                 "next_table": 0,
                 "next_table_full": 82,
@@ -67625,7 +61532,7 @@
               },
               {
                 "action_name": "spgw_ingress.set_dl_sess_info",
-                "action_handle": 536870966,
+                "action_handle": 536870934,
                 "table_name": "tbl_spgw_ingress_drop_now_0",
                 "next_table": 0,
                 "next_table_full": 82,
@@ -68028,7 +61935,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870967,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68047,7 +61954,7 @@
         },
         {
           "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68098,7 +62005,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554435,
+      "handle": 33554434,
       "name": "spgw_ingress_dl_sess_lookup$action",
       "table_type": "action",
       "size": 4096,
@@ -68145,7 +62052,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870967
+              "action_handle": 536870935
             },
             {
               "memory_word_width": 128,
@@ -68200,7 +62107,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870966
+              "action_handle": 536870934
             }
           ],
           "memory_resource_allocation": {
@@ -68216,7 +62123,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870967,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68235,7 +62142,7 @@
         },
         {
           "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68287,7 +62194,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777239,
+      "handle": 16777238,
       "name": "tbl_spgw_ingress_drop_now",
       "table_type": "match",
       "size": 1,
@@ -68314,7 +62221,7 @@
             "action_format": [
               {
                 "action_name": "spgw_ingress.drop_now",
-                "action_handle": 536870968,
+                "action_handle": 536870936,
                 "table_name": "spgw_ingress_ue_cdr_table",
                 "next_table": 0,
                 "next_table_full": 96,
@@ -68332,7 +62239,7 @@
       "actions": [
         {
           "name": "spgw_ingress.drop_now",
-          "handle": 536870968,
+          "handle": 536870936,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68362,13 +62269,13 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870968,
+      "default_action_handle": 536870936,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -68384,7 +62291,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777240,
+      "handle": 16777239,
       "name": "spgw_ingress.ue_cdr_table",
       "table_type": "match",
       "size": 3072,
@@ -68399,7 +62306,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870970,
+      "default_action_handle": 536870938,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -70723,8 +64630,8 @@
             "action_format": [
               {
                 "action_name": "spgw_ingress.update_ue_cdr",
-                "action_handle": 536870969,
-                "table_name": "tbl_act_23",
+                "action_handle": 536870937,
+                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
                 "next_table": 0,
                 "next_table_full": 97,
                 "vliw_instruction": 0,
@@ -70733,8 +64640,8 @@
               },
               {
                 "action_name": "NoAction",
-                "action_handle": 536870970,
-                "table_name": "tbl_act_23",
+                "action_handle": 536870938,
+                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
                 "next_table": 0,
                 "next_table_full": 97,
                 "vliw_instruction": 0,
@@ -71161,7 +65068,7 @@
       "actions": [
         {
           "name": "spgw_ingress.update_ue_cdr",
-          "handle": 536870969,
+          "handle": 536870937,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -71180,7 +65087,7 @@
         },
         {
           "name": "NoAction",
-          "handle": 536870970,
+          "handle": 536870938,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -71241,93 +65148,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777241,
-      "name": "tbl_act_6",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_6",
-                "action_handle": 536870971,
-                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
-                "next_table": 0,
-                "next_table_full": 98,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_6",
-          "handle": 536870971,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.ipv4_len" },
-              "src": [ { "type": "phv", "name": "H4" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870971,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777242,
+      "handle": 16777240,
       "name": "tbl_spgw_ingress_gtpu_decap",
       "table_type": "match",
       "size": 512,
@@ -71337,8 +65158,8 @@
             "stage_number": 6,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
-            "default_next_table": 3,
+            "logical_table_id": 1,
+            "default_next_table": 2,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -71387,7 +65208,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 3 ],
+            "result_physical_buses": [ 2 ],
             "ternary_indirection_stage_table": {
               "stage_number": 6,
               "stage_table_type": "ternary_indirection",
@@ -72206,12 +66027,12 @@
               "action_format": [
                 {
                   "action_name": "spgw_ingress.gtpu_decap",
-                  "action_handle": 536870972,
+                  "action_handle": 536870939,
                   "table_name": "filtering_ingress_port_vlan",
                   "next_table": 0,
-                  "next_table_full": 99,
+                  "next_table_full": 98,
                   "vliw_instruction": 1,
-                  "vliw_instruction_full": 66,
+                  "vliw_instruction_full": 65,
                   "immediate_fields": [
                     {
                       "param_name": "constant_0",
@@ -72245,7 +66066,7 @@
       "actions": [
         {
           "name": "spgw_ingress.gtpu_decap",
-          "handle": 536870972,
+          "handle": 536870939,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -72281,7 +66102,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870972,
+      "default_action_handle": 536870939,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -72291,7 +66112,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777243,
+      "handle": 16777241,
       "name": "filtering.ingress_port_vlan",
       "table_type": "match",
       "size": 512,
@@ -72301,8 +66122,8 @@
             "stage_number": 6,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 3,
-            "default_next_table": 4,
+            "logical_table_id": 2,
+            "default_next_table": 3,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -73228,42 +67049,42 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870975,
+                  "action_handle": 536870942,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 0,
                   "vliw_instruction_full": 64,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.push_internal_vlan",
-                  "action_handle": 536870973,
+                  "action_handle": 536870940,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 1,
-                  "vliw_instruction_full": 67,
+                  "vliw_instruction_full": 66,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.set_vlan",
-                  "action_handle": 536870974,
+                  "action_handle": 536870941,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 2,
                   "vliw_instruction_full": 68,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.drop",
-                  "action_handle": 536870976,
+                  "action_handle": 536870943,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 3,
-                  "vliw_instruction_full": 69,
+                  "vliw_instruction_full": 67,
                   "immediate_fields": []
                 }
               ]
@@ -73275,7 +67096,7 @@
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554436,
+          "handle": 33554435,
           "name": "filtering_ingress_port_vlan$action"
         }
       ],
@@ -73292,7 +67113,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870975,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -73311,7 +67132,7 @@
         },
         {
           "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73347,7 +67168,7 @@
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -73355,22 +67176,22 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
+              "dst": { "type": "phv", "name": "W10" },
               "src": [
                 { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             }
           ]
         },
         {
           "name": "filtering.set_vlan",
-          "handle": 536870974,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73398,14 +67219,14 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             }
           ]
         },
         {
           "name": "filtering.drop",
-          "handle": 536870976,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73432,7 +67253,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870975,
+      "default_action_handle": 536870942,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -73485,7 +67306,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 3,
+          "logical_table_id": 2,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -73515,7 +67336,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554436,
+      "handle": 33554435,
       "name": "filtering_ingress_port_vlan$action",
       "table_type": "action",
       "size": 2048,
@@ -73524,7 +67345,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "action_data",
-          "logical_table_id": 3,
+          "logical_table_id": 2,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -73562,7 +67383,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870975
+              "action_handle": 536870942
             },
             {
               "memory_word_width": 128,
@@ -73677,7 +67498,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870973
+              "action_handle": 536870940
             },
             {
               "memory_word_width": 128,
@@ -73750,7 +67571,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870974
+              "action_handle": 536870941
             },
             {
               "memory_word_width": 128,
@@ -73787,7 +67608,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870976
+              "action_handle": 536870943
             }
           ],
           "memory_resource_allocation": {
@@ -73800,7 +67621,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870975,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -73819,7 +67640,7 @@
         },
         {
           "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73855,7 +67676,7 @@
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -73863,22 +67684,22 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
+              "dst": { "type": "phv", "name": "W10" },
               "src": [
                 { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             }
           ]
         },
         {
           "name": "filtering.set_vlan",
-          "handle": 536870974,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73906,14 +67727,14 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             }
           ]
         },
         {
           "name": "filtering.drop",
-          "handle": 536870976,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73944,7 +67765,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777244,
+      "handle": 16777242,
       "name": "filtering.fwd_classifier",
       "table_type": "match",
       "size": 3072,
@@ -73959,7 +67780,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870977,
+      "default_action_handle": 536870944,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -74006,8 +67827,8 @@
             "stage_number": 6,
             "size": 3072,
             "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 101,
+            "logical_table_id": 3,
+            "default_next_table": 100,
             "has_attached_gateway": false,
             "hash_functions": [
               {
@@ -79779,12 +73600,12 @@
             "action_format": [
               {
                 "action_name": "filtering.set_forwarding_type",
-                "action_handle": 536870977,
-                "table_name": "tbl_act_29",
+                "action_handle": 536870944,
+                "table_name": "tbl_act_26",
                 "next_table": 0,
-                "next_table_full": 101,
+                "next_table_full": 100,
                 "vliw_instruction": 0,
-                "vliw_instruction_full": 70,
+                "vliw_instruction_full": 69,
                 "immediate_fields": [
                   {
                     "param_name": "fwd_type",
@@ -80395,7 +74216,7 @@
       "actions": [
         {
           "name": "filtering.set_forwarding_type",
-          "handle": 536870977,
+          "handle": 536870944,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80424,7 +74245,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.fwd_type" },
               "src": [
                 { "type": "immediate", "name": "fwd_type" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
@@ -80442,7 +74263,7 @@
           "stage_number": 6,
           "size": 4096,
           "stage_table_type": "statistics",
-          "logical_table_id": 4,
+          "logical_table_id": 3,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -80473,8 +74294,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777245,
-      "name": "tbl_act_12",
+      "handle": 16777243,
+      "name": "tbl_act_11",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -80484,7 +74305,7 @@
             "stage_number": 6,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 5,
+            "logical_table_id": 4,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -80499,11 +74320,11 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_12",
-                "action_handle": 536870978,
-                "table_name": "tbl_act_27",
+                "action_name": "act_11",
+                "action_handle": 536870945,
+                "table_name": "tbl_act_24",
                 "next_table": 0,
-                "next_table_full": 102,
+                "next_table_full": 101,
                 "vliw_instruction": 0,
                 "vliw_instruction_full": 64,
                 "immediate_fields": []
@@ -80517,8 +74338,8 @@
       },
       "actions": [
         {
-          "name": "act_12",
-          "handle": 536870978,
+          "name": "act_11",
+          "handle": 536870945,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80537,7 +74358,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870978,
+      "default_action_handle": 536870945,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -80553,8 +74374,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777246,
-      "name": "tbl_act_10",
+      "handle": 16777244,
+      "name": "tbl_act_9",
       "table_type": "match",
       "size": 512,
       "preferred_match_type": "exact",
@@ -80564,7 +74385,7 @@
             "stage_number": 6,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
+            "logical_table_id": 5,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -80576,11 +74397,11 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
-                "action_name": "act_10",
-                "action_handle": 536870979,
+                "action_name": "act_9",
+                "action_handle": 536870946,
                 "table_name": "forwarding_bridging",
                 "next_table": 0,
                 "next_table_full": 112,
@@ -80597,8 +74418,8 @@
       },
       "actions": [
         {
-          "name": "act_10",
-          "handle": 536870979,
+          "name": "act_9",
+          "handle": 536870946,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80617,7 +74438,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870979,
+      "default_action_handle": 536870946,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -80648,7 +74469,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 6,
+          "logical_table_id": 5,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -80678,7 +74499,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777247,
+      "handle": 16777245,
       "name": "forwarding.bridging",
       "table_type": "match",
       "size": 512,
@@ -80805,16 +74626,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 7,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -80829,22 +75025,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -80864,22 +75425,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -80894,7 +75445,7 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870981,
+                  "action_handle": 536870948,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -80904,21 +75455,13 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870980,
+                  "action_handle": 536870947,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 }
               ]
             }
@@ -80926,7 +75469,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554436,
+          "name": "forwarding_bridging$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -80940,7 +75489,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870981,
+          "handle": 536870948,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80955,12 +75504,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870980,
+          "handle": 536870947,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80982,17 +75530,24 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870981,
+      "default_action_handle": 536870948,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -81064,11 +75619,230 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777248,
+      "handle": 33554436,
+      "name": "forwarding_bridging$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 0,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870948
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870947
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 81 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 81
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870948,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870947,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777246,
       "name": "forwarding.mpls",
       "table_type": "match",
       "size": 3072,
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554437,
+          "name": "forwarding_mpls$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -81079,7 +75853,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870983,
+      "default_action_handle": 536870950,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -82479,8 +77253,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870983,
-                "table_name": "tbl_act_24",
+                "action_handle": 536870950,
+                "table_name": "tbl_act_21",
                 "next_table": 0,
                 "next_table_full": 114,
                 "vliw_instruction": 0,
@@ -82489,8 +77263,8 @@
               },
               {
                 "action_name": "forwarding.pop_mpls_and_next",
-                "action_handle": 536870982,
-                "table_name": "tbl_act_24",
+                "action_handle": 536870949,
+                "table_name": "tbl_act_21",
                 "next_table": 0,
                 "next_table_full": 114,
                 "vliw_instruction": 1,
@@ -82500,8 +77274,8 @@
                     "param_name": "next_id",
                     "param_type": "parameter",
                     "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 32
+                    "dest_start": 16,
+                    "dest_width": 16
                   }
                 ]
               }
@@ -82889,10 +77663,11 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870983,
+          "handle": 536870950,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
           "p4_parameters": [],
           "override_meter_addr": false,
           "override_meter_addr_pfe": false,
@@ -82903,15 +77678,15 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.pop_mpls_and_next",
-          "handle": 536870982,
+          "handle": 536870949,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
           "p4_parameters": [
             {
               "name": "next_id",
@@ -82929,7 +77704,6 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
@@ -82941,8 +77715,16 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "immediate", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
@@ -82990,8 +77772,343 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777249,
-      "name": "tbl_act_7",
+      "handle": 33554437,
+      "name": "forwarding_mpls$action",
+      "table_type": "action",
+      "size": 8192,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 8192,
+          "stage_table_type": "action_data",
+          "logical_table_id": 1,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 8,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 7,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 6,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 5,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 4,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 3,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 2,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870950
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 8,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 7,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 6,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 5,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 4,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 3,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 2,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "next_id"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870949
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 88
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870950,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.pop_mpls_and_next",
+          "handle": 536870949,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "mpls.$valid" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "B8" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "immediate", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777247,
+      "name": "tbl_act_6",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -83188,8 +78305,8 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "act_7",
-                  "action_handle": 536870984,
+                  "action_name": "act_6",
+                  "action_handle": 536870951,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -83215,8 +78332,8 @@
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554437,
-          "name": "tbl_act_24$action"
+          "handle": 33554438,
+          "name": "tbl_act_21$action"
         }
       ],
       "selection_table_refs": [],
@@ -83225,8 +78342,8 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "act_7",
-          "handle": 536870984,
+          "name": "act_6",
+          "handle": 536870951,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83247,7 +78364,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -83255,13 +78372,13 @@
               "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
+                { "type": "phv", "name": "W35" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870984,
+      "default_action_handle": 536870951,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -83271,8 +78388,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554437,
-      "name": "tbl_act_24$action",
+      "handle": 33554438,
+      "name": "tbl_act_21$action",
       "table_type": "action",
       "size": 4096,
       "stage_tables": [
@@ -83386,7 +78503,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870984
+              "action_handle": 536870951
             }
           ],
           "memory_resource_allocation": {
@@ -83398,8 +78515,8 @@
       ],
       "actions": [
         {
-          "name": "act_7",
-          "handle": 536870984,
+          "name": "act_6",
+          "handle": 536870951,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83420,7 +78537,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -83428,7 +78545,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
+                { "type": "phv", "name": "W35" }
               ]
             }
           ]
@@ -83438,7 +78555,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777250,
+      "handle": 16777248,
       "name": "forwarding.unicast_v4",
       "table_type": "match",
       "size": 512,
@@ -83583,16 +78700,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 7,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -83607,22 +79099,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -83642,22 +79499,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -83672,7 +79519,7 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870986,
+                  "action_handle": 536870953,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -83682,21 +79529,13 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870985,
+                  "action_handle": 536870952,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 68,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 }
               ]
             }
@@ -83704,7 +79543,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554439,
+          "name": "forwarding_unicast_v4$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -83718,7 +79563,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870986,
+          "handle": 536870953,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83733,12 +79578,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870985,
+          "handle": 536870952,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83760,17 +79604,24 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870986,
+      "default_action_handle": 536870953,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -83831,7 +79682,220 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777251,
+      "handle": 33554439,
+      "name": "forwarding_unicast_v4$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 3,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870953
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870952
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 75 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 75
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870953,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870952,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777249,
       "name": "forwarding.acl",
       "table_type": "match",
       "size": 256,
@@ -83999,7 +80063,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.l4_dst_port",
+                        "field_name": "fabric_metadata.original_ether_type",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 5,
                         "msb_mem_word_idx": 5,
@@ -84026,7 +80090,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.original_ether_type",
+                        "field_name": "ipv4.dst_addr",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -84053,7 +80117,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.dst_addr",
+                        "field_name": "ipv4.src_addr",
                         "lsb_mem_word_offset": 9,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -84062,7 +80126,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.l4_dst_port",
+                        "field_name": "fabric_metadata.original_ether_type",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -84089,7 +80153,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.original_ether_type",
+                        "field_name": "ipv4.dst_addr",
                         "lsb_mem_word_offset": 1,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84116,7 +80180,7 @@
                         "field_width": 4
                       },
                       {
-                        "field_name": "ipv4.src_addr",
+                        "field_name": "standard_metadata.ingress_port",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84125,7 +80189,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.dst_addr",
+                        "field_name": "ipv4.src_addr",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84152,7 +80216,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "standard_metadata.ingress_port",
+                        "field_name": "ethernet.dst_addr",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84161,7 +80225,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.src_addr",
+                        "field_name": "fabric_metadata.l4_dst_port",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84170,7 +80234,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ethernet.dst_addr",
+                        "field_name": "fabric_metadata.l4_dst_port",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84282,16 +80346,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 8,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -84306,22 +80745,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -84341,22 +81145,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -84371,7 +81165,7 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870990,
+                  "action_handle": 536870957,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
@@ -84381,44 +81175,27 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870987,
+                  "action_handle": 536870954,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 },
                 {
                   "action_name": "forwarding.duplicate_to_controller",
-                  "action_handle": 536870988,
+                  "action_handle": 536870955,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
                   "vliw_instruction": 2,
                   "vliw_instruction_full": 65,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_320",
-                      "param_type": "constant",
-                      "const_value": 320,
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 9
-                    }
-                  ]
+                  "immediate_fields": []
                 },
                 {
                   "action_name": "forwarding.drop",
-                  "action_handle": 536870989,
+                  "action_handle": 536870956,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
@@ -84432,7 +81209,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554440,
+          "name": "forwarding_acl$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -84446,7 +81229,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870990,
+          "handle": 536870957,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -84461,12 +81244,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870987,
+          "handle": 536870954,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84488,18 +81270,25 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         },
         {
           "name": "forwarding.duplicate_to_controller",
-          "handle": 536870988,
+          "handle": 536870955,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84514,13 +81303,12 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
-                { "type": "immediate", "name": "$constant0" },
+                { "type": "action_param", "name": "$constant0" },
                 { "type": "phv", "name": "H1" }
               ]
             }
@@ -84528,7 +81316,7 @@
         },
         {
           "name": "forwarding.drop",
-          "handle": 536870989,
+          "handle": 536870956,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84543,7 +81331,6 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
@@ -84556,7 +81343,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870990,
+      "default_action_handle": 536870957,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -84738,14 +81525,395 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777252,
+      "handle": 33554440,
+      "name": "forwarding_acl$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 8,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 0,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870957
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870954
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 192, "dest_width": 9 } ],
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "$constant0"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 39,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 89,
+                      "field_name": "--padding_25_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 192, "dest_width": 9 } ],
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "$constant0"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 39,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 25,
+                      "field_name": "--padding_25_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870955
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870956
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 90
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "nop",
+          "handle": 536870957,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870954,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "forwarding.duplicate_to_controller",
+          "handle": 536870955,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
+              "src": [
+                { "type": "action_param", "name": "$constant0" },
+                { "type": "phv", "name": "H1" }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "forwarding.drop",
+          "handle": 536870956,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "ig_intr_md_for_dprs.drop_ctl" },
+              "src": [
+                { "type": "immediate", "name": "1" },
+                { "type": "phv", "name": "B2" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777250,
       "name": "next.simple",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554438,
+          "handle": 33554441,
           "name": "next_simple$action"
         }
       ],
@@ -84759,7 +81927,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870995,
+      "default_action_handle": 536870962,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -84795,6 +81963,54 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 0,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -84817,54 +82033,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -84873,13 +82041,55 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -84895,48 +82105,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -84945,49 +82113,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -84999,19 +82155,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
+                        "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85021,6 +82165,30 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85029,31 +82197,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85065,7 +82209,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85077,7 +82221,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85089,31 +82257,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85125,7 +82269,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85137,40 +82281,64 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 4,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85179,36 +82347,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85221,13 +82359,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85245,19 +82383,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85269,60 +82437,24 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85335,13 +82467,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85353,37 +82521,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85401,19 +82539,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85425,42 +82593,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85473,7 +82605,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85491,7 +82635,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85503,13 +82653,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85521,67 +82689,67 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85593,37 +82761,19 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 0,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85635,24 +82785,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85665,13 +82797,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85683,42 +82851,18 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85731,13 +82875,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85747,6 +82897,24 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85755,37 +82923,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85803,13 +82941,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85825,6 +82957,42 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85833,13 +83001,67 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 3,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 14,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85857,7 +83079,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85885,21 +83125,9 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85911,13 +83139,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 15,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 17,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85953,6 +83187,264 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 16,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 17,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 18,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85971,7 +83463,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85979,17 +83495,155 @@
                     ]
                   },
                   {
-                    "hash_bit": 15,
+                    "hash_bit": 19,
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 5,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 20,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86017,14 +83671,98 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 21,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 22,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86043,6 +83781,18 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86061,540 +83811,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
                         "field_bit": 2,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86607,13 +83823,229 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 23,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 24,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 4,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 25,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 26,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86631,66 +84063,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86703,66 +84075,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86775,107 +84087,35 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
                       {
                         "field_bit": 6,
                         "field_name": "fabric_metadata.next_id",
@@ -86883,18 +84123,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86907,13 +84135,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 14,
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 27,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86937,7 +84171,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86949,19 +84183,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86971,13 +84193,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 7,
                         "field_name": "fabric_metadata.next_id",
@@ -86985,43 +84201,43 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 28,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
+                        "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -87049,13 +84265,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
@@ -87069,12 +84279,24 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 16,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 29,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -87099,6 +84321,18 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -87111,7 +84345,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -87121,13 +84355,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
@@ -87157,66 +84385,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   }
@@ -87227,7 +84395,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870995,
+                "action_handle": 536870962,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87237,7 +84405,7 @@
               },
               {
                 "action_name": "next.output",
-                "action_handle": 536870991,
+                "action_handle": 536870958,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87247,7 +84415,7 @@
               },
               {
                 "action_name": "next.set_vlan_output",
-                "action_handle": 536870992,
+                "action_handle": 536870959,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87257,7 +84425,7 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870993,
+                "action_handle": 536870960,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87267,7 +84435,7 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870994,
+                "action_handle": 536870961,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87695,7 +84863,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870995,
+          "handle": 536870962,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87714,7 +84882,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870991,
+          "handle": 536870958,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87749,7 +84917,7 @@
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870992,
+          "handle": 536870959,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87783,7 +84951,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -87791,7 +84959,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
@@ -87806,7 +84974,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870993,
+          "handle": 536870960,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87849,7 +85017,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -87866,7 +85034,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870994,
+          "handle": 536870961,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87918,7 +85086,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -87931,7 +85099,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -87946,7 +85114,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -87995,7 +85163,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554438,
+      "handle": 33554441,
       "name": "next_simple$action",
       "table_type": "action",
       "size": 3072,
@@ -88028,7 +85196,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870995
+              "action_handle": 536870962
             },
             {
               "memory_word_width": 128,
@@ -88069,7 +85237,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870991
+              "action_handle": 536870958
             },
             {
               "memory_word_width": 128,
@@ -88128,7 +85296,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870992
+              "action_handle": 536870959
             },
             {
               "memory_word_width": 128,
@@ -88205,7 +85373,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870993
+              "action_handle": 536870960
             },
             {
               "memory_word_width": 128,
@@ -88340,7 +85508,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870994
+              "action_handle": 536870961
             }
           ],
           "memory_resource_allocation": {
@@ -88357,7 +85525,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870995,
+          "handle": 536870962,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88376,7 +85544,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870991,
+          "handle": 536870958,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88411,7 +85579,7 @@
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870992,
+          "handle": 536870959,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88445,7 +85613,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -88453,7 +85621,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
@@ -88468,7 +85636,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870993,
+          "handle": 536870960,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88511,7 +85679,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -88528,7 +85696,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870994,
+          "handle": 536870961,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88580,7 +85748,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -88593,7 +85761,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -88608,7 +85776,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -88618,8 +85786,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777253,
-      "name": "tbl_act_8",
+      "handle": 16777251,
+      "name": "tbl_act_7",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -88644,8 +85812,8 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_8",
-                "action_handle": 536870996,
+                "action_name": "act_7",
+                "action_handle": 536870963,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -88662,8 +85830,8 @@
       },
       "actions": [
         {
-          "name": "act_8",
-          "handle": 536870996,
+          "name": "act_7",
+          "handle": 536870963,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88692,7 +85860,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870996,
+      "default_action_handle": 536870963,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -88708,14 +85876,14 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777254,
+      "handle": 16777252,
       "name": "next.hashed",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "indirect",
-          "handle": 33554439,
+          "handle": 33554442,
           "name": "next.ecmp_selector"
         }
       ],
@@ -88737,7 +85905,7 @@
       "stateful_table_refs": [],
       "default_selector_mask": 0,
       "default_selector_value": 0,
-      "default_action_handle": 536871000,
+      "default_action_handle": 536870967,
       "action_profile": "next.ecmp_selector",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -88773,6 +85941,30 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -88785,13 +85977,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88809,37 +86001,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88851,19 +86019,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 19,
+                        "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88875,43 +86061,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
+                        "field_bit": 29,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88923,54 +86091,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 2,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -88983,7 +86103,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88993,6 +86113,54 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89001,72 +86169,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 3,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89103,7 +86205,73 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89115,13 +86283,31 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 17,
+                        "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89139,7 +86325,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89161,36 +86359,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89199,61 +86367,13 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 5,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89265,7 +86385,55 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89277,54 +86445,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 6,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89343,22 +86463,70 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89367,19 +86535,49 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 17,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89397,7 +86595,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89407,36 +86605,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89445,42 +86613,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89493,7 +86625,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89505,7 +86637,43 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89517,19 +86685,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 18,
+                        "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89545,24 +86731,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89571,6 +86739,36 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89583,7 +86781,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89595,12 +86799,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89619,7 +86817,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89635,36 +86833,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89673,48 +86841,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89727,7 +86853,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89743,96 +86869,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 20,
@@ -89847,90 +86883,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89943,6 +86895,90 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 12,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89953,8 +86989,92 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 13,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 14,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89967,13 +87087,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89983,21 +87097,9 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90009,13 +87111,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90027,66 +87123,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90099,7 +87135,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 6,
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 15,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 5,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90111,7 +87171,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90127,13 +87187,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
@@ -90147,6 +87201,150 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 16,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 17,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90165,156 +87363,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90331,13 +87379,91 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 18,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 19,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
                         "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
@@ -90351,7 +87477,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90361,18 +87487,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 17,
@@ -90387,12 +87501,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90411,13 +87519,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90427,7 +87529,13 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 20,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
                         "field_bit": 0,
                         "field_name": "fabric_metadata.next_id",
@@ -90441,67 +87549,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90513,18 +87561,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90537,144 +87573,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90687,13 +87585,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90711,7 +87609,67 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 21,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90723,6 +87681,162 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 22,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 23,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 24,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90735,222 +87849,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90967,13 +87865,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
@@ -90987,13 +87879,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91005,25 +87909,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
+                        "field_bit": 29,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91031,10 +87917,22 @@
                     ]
                   },
                   {
-                    "hash_bit": 29,
+                    "hash_bit": 25,
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -91047,13 +87945,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91071,13 +87975,37 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 9,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 26,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91095,7 +88023,247 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 27,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 28,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 29,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91109,8 +88277,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536871000,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870967,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 0,
@@ -91119,8 +88287,8 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870997,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870964,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 1,
@@ -91129,8 +88297,8 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870998,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870965,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 2,
@@ -91139,8 +88307,8 @@
               },
               {
                 "action_name": "next.mpls_routing_v6",
-                "action_handle": 536870999,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870966,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 3,
@@ -91633,7 +88801,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536871000,
+          "handle": 536870967,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91652,7 +88820,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870997,
+          "handle": 536870964,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91695,7 +88863,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91712,7 +88880,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870998,
+          "handle": 536870965,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91764,7 +88932,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -91777,7 +88945,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91792,14 +88960,14 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870999,
+          "handle": 536870966,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91851,7 +89019,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -91864,7 +89032,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91879,7 +89047,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -91895,7 +89063,7 @@
       "selection_type": "fair",
       "how_referenced": "indirect",
       "max_port_pool_size": 120,
-      "bound_to_action_data_table_handle": 33554439,
+      "bound_to_action_data_table_handle": 33554442,
       "stage_tables": [
         {
           "stage_number": 10,
@@ -91922,7 +89090,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554439,
+      "handle": 33554442,
       "name": "next.ecmp_selector",
       "table_type": "action",
       "size": 64,
@@ -91955,7 +89123,7 @@
                   ]
                 }
               ],
-              "action_handle": 536871000
+              "action_handle": 536870967
             },
             {
               "memory_word_width": 128,
@@ -92032,7 +89200,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870997
+              "action_handle": 536870964
             },
             {
               "memory_word_width": 128,
@@ -92167,7 +89335,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870998
+              "action_handle": 536870965
             },
             {
               "memory_word_width": 128,
@@ -92302,7 +89470,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870999
+              "action_handle": 536870966
             }
           ],
           "memory_resource_allocation": {
@@ -92315,7 +89483,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536871000,
+          "handle": 536870967,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92334,7 +89502,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870997,
+          "handle": 536870964,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92377,7 +89545,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92394,7 +89562,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870998,
+          "handle": 536870965,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92446,7 +89614,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -92459,7 +89627,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92474,14 +89642,14 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870999,
+          "handle": 536870966,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92533,7 +89701,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -92546,7 +89714,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92561,7 +89729,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -92611,8 +89779,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777255,
-      "name": "tbl_act_11",
+      "handle": 16777253,
+      "name": "tbl_act_10",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -92637,9 +89805,9 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_11",
-                "action_handle": 536871001,
-                "table_name": "tbl_act_26",
+                "action_name": "act_10",
+                "action_handle": 536870968,
+                "table_name": "tbl_act_23",
                 "next_table": 0,
                 "next_table_full": 177,
                 "vliw_instruction": 1,
@@ -92655,8 +89823,8 @@
       },
       "actions": [
         {
-          "name": "act_11",
-          "handle": 536871001,
+          "name": "act_10",
+          "handle": 536870968,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92677,8 +89845,8 @@
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
-                { "type": "phv", "name": "W7" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W10" },
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92692,7 +89860,7 @@
           ]
         }
       ],
-      "default_action_handle": 536871001,
+      "default_action_handle": 536870968,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -92708,8 +89876,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777256,
-      "name": "tbl_act_9",
+      "handle": 16777254,
+      "name": "tbl_act_8",
       "table_type": "match",
       "size": 512,
       "preferred_match_type": "exact",
@@ -92734,8 +89902,8 @@
             "result_physical_buses": [ 1 ],
             "action_format": [
               {
-                "action_name": "act_9",
-                "action_handle": 536871002,
+                "action_name": "act_8",
+                "action_handle": 536870969,
                 "table_name": "--END_OF_PIPELINE--",
                 "next_table": 0,
                 "next_table_full": 255,
@@ -92752,8 +89920,8 @@
       },
       "actions": [
         {
-          "name": "act_9",
-          "handle": 536871002,
+          "name": "act_8",
+          "handle": 536870969,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92772,7 +89940,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536871002,
+      "default_action_handle": 536870969,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -92861,27 +90029,17 @@
     {
       "fully_qualified_name": "mau[0].dp.match_input_xbar_din_power_ctl",
       "name": "stage_0_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000001800000022000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[0].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_0_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000001800000008000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[1].dp.match_input_xbar_din_power_ctl",
       "name": "stage_1_match_input_xbar_din_power_ctl",
-      "value": "00000000000000000000000000000000000000800000000000000000000000de000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[1].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_1_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000080000000000000000000000018000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[2].dp.match_input_xbar_din_power_ctl",
       "name": "stage_2_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000000000000000000000000000040000000000000000000000003000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[3].dp.match_input_xbar_din_power_ctl",
@@ -92896,12 +90054,12 @@
     {
       "fully_qualified_name": "mau[4].dp.match_input_xbar_din_power_ctl",
       "name": "stage_4_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[5].dp.match_input_xbar_din_power_ctl",
       "name": "stage_5_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[5].dp.xbar_hash.hash.parity_group_mask",
@@ -92911,7 +90069,7 @@
     {
       "fully_qualified_name": "mau[6].dp.match_input_xbar_din_power_ctl",
       "name": "stage_6_match_input_xbar_din_power_ctl",
-      "value": "0000009000000040000000000000000000000000000000010000000000000000000000000000003800000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000004000000000000000000000000000000010000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[6].dp.xbar_hash.hash.parity_group_mask",
@@ -92921,7 +90079,7 @@
     {
       "fully_qualified_name": "mau[7].dp.match_input_xbar_din_power_ctl",
       "name": "stage_7_match_input_xbar_din_power_ctl",
-      "value": "0000009000000060000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[7].dp.xbar_hash.hash.parity_group_mask",
@@ -92931,12 +90089,12 @@
     {
       "fully_qualified_name": "mau[8].dp.match_input_xbar_din_power_ctl",
       "name": "stage_8_match_input_xbar_din_power_ctl",
-      "value": "000000d2000000c000000000000000000000002000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "000000120000000600000000000000000000002000000000000000000000000000000000000000b80000000000000000000000000000000100000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[9].dp.match_input_xbar_din_power_ctl",
       "name": "stage_9_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000008000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[9].dp.xbar_hash.hash.parity_group_mask",
@@ -92946,7 +90104,7 @@
     {
       "fully_qualified_name": "mau[10].dp.match_input_xbar_din_power_ctl",
       "name": "stage_10_match_input_xbar_din_power_ctl",
-      "value": "0000001200000000000000000000000000000060000000010000000000000000000000000000008000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "000000920000000000000000000000000000006000000001000000000000000000000000000000c000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[10].dp.xbar_hash.hash.parity_group_mask",
@@ -92956,7 +90114,7 @@
     {
       "fully_qualified_name": "mau[11].dp.match_input_xbar_din_power_ctl",
       "name": "stage_11_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[11].dp.xbar_hash.hash.parity_group_mask",
@@ -92964,4 +90122,4 @@
       "value": "00000001000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/fabric.p4info
old mode 100644
new mode 100755
similarity index 67%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/fabric.p4info
index cddc88a..3b4f3d5
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/fabric.p4info
@@ -372,145 +372,6 @@
   direct_resource_ids: 302023316
   size: 1024
 }
-tables {
-  preamble {
-    id: 33583029
-    name: "int_egress.int_metadata_insert.int_inst_0003"
-    alias: "int_inst_0003"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0003"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16831286
-  }
-  action_refs {
-    id: 16842664
-  }
-  action_refs {
-    id: 16816733
-  }
-  action_refs {
-    id: 16819517
-  }
-  action_refs {
-    id: 16794056
-  }
-  action_refs {
-    id: 16804966
-  }
-  action_refs {
-    id: 16779523
-  }
-  action_refs {
-    id: 16794789
-  }
-  action_refs {
-    id: 16834584
-  }
-  action_refs {
-    id: 16780654
-  }
-  action_refs {
-    id: 16841202
-  }
-  action_refs {
-    id: 16800429
-  }
-  action_refs {
-    id: 16842176
-  }
-  action_refs {
-    id: 16810248
-  }
-  action_refs {
-    id: 16786933
-  }
-  action_refs {
-    id: 16828419
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33570208
-    name: "int_egress.int_metadata_insert.int_inst_0407"
-    alias: "int_inst_0407"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0407"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16794499
-  }
-  action_refs {
-    id: 16785636
-  }
-  action_refs {
-    id: 16819629
-  }
-  action_refs {
-    id: 16816181
-  }
-  action_refs {
-    id: 16809168
-  }
-  action_refs {
-    id: 16798574
-  }
-  action_refs {
-    id: 16783327
-  }
-  action_refs {
-    id: 16796243
-  }
-  action_refs {
-    id: 16787702
-  }
-  action_refs {
-    id: 16778104
-  }
-  action_refs {
-    id: 16794531
-  }
-  action_refs {
-    id: 16805663
-  }
-  action_refs {
-    id: 16809122
-  }
-  action_refs {
-    id: 16783399
-  }
-  action_refs {
-    id: 16823769
-  }
-  action_refs {
-    id: 16797996
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33604372
-    name: "int_egress.int_prep"
-    alias: "int_prep"
-  }
-  action_refs {
-    id: 16841868
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 1024
-}
 actions {
   preamble {
     id: 16800567
@@ -756,97 +617,6 @@
 }
 actions {
   preamble {
-    id: 16831286
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i0"
-    alias: "int_set_header_0003_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16842664
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i1"
-    alias: "int_set_header_0003_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16816733
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i2"
-    alias: "int_set_header_0003_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16819517
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i3"
-    alias: "int_set_header_0003_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16794056
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i4"
-    alias: "int_set_header_0003_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16804966
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i5"
-    alias: "int_set_header_0003_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16779523
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i6"
-    alias: "int_set_header_0003_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16794789
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i7"
-    alias: "int_set_header_0003_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16834584
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i8"
-    alias: "int_set_header_0003_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16780654
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i9"
-    alias: "int_set_header_0003_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16841202
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i10"
-    alias: "int_set_header_0003_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16800429
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i11"
-    alias: "int_set_header_0003_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16842176
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i12"
-    alias: "int_set_header_0003_i12"
-  }
-}
-actions {
-  preamble {
     id: 16810248
     name: "int_egress.int_metadata_insert.int_set_header_0003_i13"
     alias: "int_set_header_0003_i13"
@@ -854,104 +624,6 @@
 }
 actions {
   preamble {
-    id: 16786933
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i14"
-    alias: "int_set_header_0003_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16828419
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i15"
-    alias: "int_set_header_0003_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16794499
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i0"
-    alias: "int_set_header_0407_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16785636
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i1"
-    alias: "int_set_header_0407_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16819629
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i2"
-    alias: "int_set_header_0407_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16816181
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i3"
-    alias: "int_set_header_0407_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16809168
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i4"
-    alias: "int_set_header_0407_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16798574
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i5"
-    alias: "int_set_header_0407_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16783327
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i6"
-    alias: "int_set_header_0407_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16796243
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i7"
-    alias: "int_set_header_0407_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16787702
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i8"
-    alias: "int_set_header_0407_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16778104
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i9"
-    alias: "int_set_header_0407_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16794531
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i10"
-    alias: "int_set_header_0407_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16805663
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i11"
-    alias: "int_set_header_0407_i11"
-  }
-}
-actions {
-  preamble {
     id: 16809122
     name: "int_egress.int_metadata_insert.int_set_header_0407_i12"
     alias: "int_set_header_0407_i12"
@@ -959,27 +631,6 @@
 }
 actions {
   preamble {
-    id: 16783399
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i13"
-    alias: "int_set_header_0407_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16823769
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i14"
-    alias: "int_set_header_0407_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16797996
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i15"
-    alias: "int_set_header_0407_i15"
-  }
-}
-actions {
-  preamble {
     id: 16796837
     name: "int_egress.int_outer_encap.int_update_ipv4"
     alias: "int_update_ipv4"
@@ -1005,11 +656,6 @@
     name: "int_egress.int_transit"
     alias: "int_transit"
   }
-  params {
-    id: 1
-    name: "switch_id"
-    bitwidth: 32
-  }
 }
 actions {
   preamble {
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/tofino.bin
similarity index 71%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/tofino.bin
index 96f5a23..aaf4c92 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-1/montara/tofino.bin
Binary files differ
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/context.json
old mode 100644
new mode 100755
similarity index 90%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/context.json
index a1aaebd..5344696
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/context.json
@@ -1,5 +1,5 @@
 {
-  "build_date": "03/23/18 21:19:12",
+  "build_date": "03/24/18 19:14:58",
   "schema_version": "1.3.3",
   "compiler_version": "6.0.0-alpha.7",
   "program_name": "main",
@@ -14,7 +14,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32,7 +32,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -50,7 +50,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -68,7 +68,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -86,7 +86,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -104,7 +104,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -122,6 +122,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -147,11 +212,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -162,7 +227,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -173,7 +238,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -184,7 +249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -198,99 +263,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -300,8 +278,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -318,7 +296,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -332,11 +397,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -347,7 +412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -358,7 +423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -369,7 +434,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -383,7 +448,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -401,7 +466,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -419,29 +484,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -455,29 +502,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -495,7 +524,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -513,7 +542,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -531,7 +560,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -549,7 +578,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -616,7 +645,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -635,7 +664,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -654,7 +683,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -673,7 +702,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -718,7 +747,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -737,7 +766,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -756,7 +785,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -775,7 +804,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -820,7 +849,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -839,7 +868,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -858,7 +887,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -877,7 +906,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -891,7 +920,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -909,7 +938,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -927,61 +956,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -992,7 +967,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1003,7 +978,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1014,7 +989,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1028,11 +1003,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1043,7 +1018,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1054,7 +1029,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1065,7 +1040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1079,11 +1054,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1094,7 +1069,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1108,11 +1083,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1123,7 +1098,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1137,12 +1112,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -1159,24 +1188,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -1188,7 +1199,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1210,7 +1221,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1232,7 +1243,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1243,7 +1254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1257,7 +1268,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -1275,7 +1286,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -1290,7 +1301,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1301,7 +1312,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1315,11 +1326,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1330,7 +1341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1344,11 +1355,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1362,6 +1391,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -1399,7 +1446,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1410,7 +1457,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1421,7 +1468,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1432,7 +1479,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1443,7 +1490,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1454,7 +1501,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1465,7 +1512,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1476,7 +1523,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1516,7 +1563,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1527,7 +1574,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1538,7 +1585,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1549,7 +1596,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1560,7 +1607,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1571,7 +1618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1582,7 +1629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1593,7 +1640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1604,7 +1651,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1615,7 +1662,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1626,7 +1673,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1637,7 +1684,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1648,7 +1695,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1659,7 +1706,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1670,7 +1717,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1688,7 +1735,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1699,7 +1746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1710,7 +1757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1721,7 +1768,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1732,7 +1779,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1743,7 +1790,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1754,7 +1801,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1765,7 +1812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1783,7 +1830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1794,7 +1841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1805,7 +1852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1816,7 +1863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1827,7 +1874,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1838,7 +1885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1849,7 +1896,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -1867,7 +1914,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1885,7 +1932,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1914,7 +1961,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -1950,7 +1997,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1961,7 +2008,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1979,7 +2026,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -2026,17 +2073,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -2046,7 +2082,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2064,8 +2100,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -2082,6 +2118,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -2096,11 +2168,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2114,7 +2186,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -2132,11 +2204,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2150,7 +2222,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -2168,29 +2240,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2204,11 +2258,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2222,7 +2276,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -2273,7 +2327,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -2302,94 +2356,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2407,7 +2378,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2425,7 +2396,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2443,7 +2414,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2461,7 +2432,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2479,23 +2450,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -2508,8 +2468,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -2526,25 +2486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2558,40 +2500,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2605,11 +2518,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2623,7 +2536,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -2746,41 +2659,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -2798,7 +2685,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -2810,6 +2723,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -2817,8 +2749,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -2836,8 +2768,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -2855,8 +2787,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -2875,7 +2807,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -2894,7 +2826,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -2912,8 +2844,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -2922,7 +2854,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -2931,25 +2863,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -2957,26 +2870,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -2988,51 +2882,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -3040,8 +2889,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -3059,8 +2908,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -3073,133 +2922,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -3214,25 +2936,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -3250,7 +2954,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -3268,7 +3099,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -3286,11 +3117,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3304,11 +3135,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3322,7 +3153,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -3340,11 +3171,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3355,7 +3186,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3369,11 +3200,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3387,7 +3218,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -3471,7 +3302,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -3522,7 +3353,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -3540,7 +3371,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -3558,7 +3389,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -3576,11 +3407,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -3598,7 +3429,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3609,7 +3440,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3620,7 +3451,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3631,7 +3462,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3682,7 +3513,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3693,7 +3524,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3704,7 +3535,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3715,7 +3546,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3755,7 +3586,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3766,7 +3597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3777,7 +3608,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3788,7 +3619,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3835,7 +3666,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3846,7 +3677,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3886,7 +3717,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3897,7 +3728,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3951,7 +3782,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3969,7 +3800,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3987,7 +3818,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4016,7 +3847,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4045,7 +3876,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4056,7 +3887,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4074,23 +3905,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -4103,10 +3934,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -4114,10 +3945,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -4132,7 +3981,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4143,7 +4043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4154,7 +4054,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4165,7 +4065,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4176,7 +4076,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4187,7 +4087,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4223,7 +4123,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -4241,74 +4141,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -4325,7 +4163,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4334,6 +4172,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -4348,7 +4241,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4366,7 +4259,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4384,7 +4277,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4402,7 +4295,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4420,7 +4313,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4438,7 +4331,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4456,6 +4349,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -4481,11 +4439,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4496,7 +4454,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4507,7 +4465,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4518,7 +4476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4532,99 +4490,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -4634,8 +4505,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -4652,7 +4523,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4666,11 +4624,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4681,7 +4639,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4692,7 +4650,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4703,7 +4661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4717,7 +4675,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -4735,7 +4693,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -4753,29 +4711,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4789,29 +4729,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4829,7 +4751,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4847,7 +4769,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4865,7 +4787,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4883,7 +4805,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4950,7 +4872,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -4969,7 +4891,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -4988,7 +4910,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -5007,7 +4929,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -5052,7 +4974,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -5071,7 +4993,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -5090,7 +5012,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -5109,7 +5031,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -5154,7 +5076,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -5173,7 +5095,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -5192,7 +5114,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -5211,7 +5133,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -5225,7 +5147,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5243,7 +5165,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5261,61 +5183,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5326,7 +5194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5337,7 +5205,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5348,7 +5216,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5362,11 +5230,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5377,7 +5245,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5388,7 +5256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5399,7 +5267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5413,11 +5281,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5428,7 +5296,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5442,11 +5310,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5457,7 +5325,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5471,12 +5339,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -5493,24 +5415,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -5522,7 +5426,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5544,7 +5448,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5566,7 +5470,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5577,7 +5481,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5591,7 +5495,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -5609,7 +5513,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -5624,7 +5528,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5635,7 +5539,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5649,11 +5553,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5664,7 +5568,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5678,11 +5582,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5696,6 +5618,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -5733,7 +5673,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5744,7 +5684,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5755,7 +5695,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5766,7 +5706,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5777,7 +5717,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5788,7 +5728,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5799,7 +5739,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5810,7 +5750,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5850,7 +5790,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5861,7 +5801,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5872,7 +5812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5883,7 +5823,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5894,7 +5834,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5905,7 +5845,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5916,7 +5856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5927,7 +5867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5938,7 +5878,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5949,7 +5889,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5960,7 +5900,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5971,7 +5911,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5982,7 +5922,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5993,7 +5933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6004,7 +5944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6022,7 +5962,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6033,7 +5973,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6044,7 +5984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6055,7 +5995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6066,7 +6006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6077,7 +6017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6088,7 +6028,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6099,7 +6039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6117,7 +6057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6128,7 +6068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6139,7 +6079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6150,7 +6090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6161,7 +6101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6172,7 +6112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6183,7 +6123,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -6201,7 +6141,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6219,7 +6159,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6248,7 +6188,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6284,7 +6224,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6295,7 +6235,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6313,7 +6253,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -6360,17 +6300,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -6380,7 +6309,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6398,8 +6327,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -6416,6 +6345,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -6430,11 +6395,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6448,7 +6413,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -6466,11 +6431,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6484,7 +6449,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -6502,29 +6467,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6538,11 +6485,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6556,7 +6503,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -6607,7 +6554,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -6636,94 +6583,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6741,7 +6605,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6759,7 +6623,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6777,7 +6641,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6795,7 +6659,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6813,23 +6677,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -6842,8 +6695,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -6860,25 +6713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6892,40 +6727,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6939,11 +6745,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6957,7 +6763,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -7080,41 +6886,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -7132,7 +6912,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -7144,6 +6950,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -7151,8 +6976,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -7170,8 +6995,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -7189,8 +7014,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -7209,7 +7034,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -7228,7 +7053,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -7246,8 +7071,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -7256,7 +7081,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -7265,25 +7090,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -7291,26 +7097,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -7322,51 +7109,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -7374,8 +7116,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -7393,8 +7135,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -7407,133 +7149,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -7548,25 +7163,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -7584,7 +7181,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -7602,7 +7326,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -7620,11 +7344,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7638,11 +7362,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7656,7 +7380,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -7674,11 +7398,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7689,7 +7413,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7703,11 +7427,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7721,7 +7445,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -7805,7 +7529,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -7856,7 +7580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -7874,7 +7598,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -7892,7 +7616,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -7910,11 +7634,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -7932,7 +7656,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7943,7 +7667,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7954,7 +7678,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7965,7 +7689,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8016,7 +7740,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8027,7 +7751,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8038,7 +7762,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8049,7 +7773,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8089,7 +7813,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8100,7 +7824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8111,7 +7835,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8122,7 +7846,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8169,7 +7893,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8180,7 +7904,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8220,7 +7944,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8231,7 +7955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8285,7 +8009,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8303,7 +8027,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8321,7 +8045,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8350,7 +8074,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8379,7 +8103,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8390,7 +8114,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8408,23 +8132,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -8437,10 +8161,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -8448,10 +8172,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -8466,7 +8208,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8477,7 +8270,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8488,7 +8281,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8499,7 +8292,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8510,7 +8303,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8521,7 +8314,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8557,7 +8350,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -8575,74 +8368,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -8659,7 +8390,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8668,6 +8399,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -8682,7 +8468,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8700,7 +8486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8718,7 +8504,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8736,7 +8522,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8754,7 +8540,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8772,7 +8558,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8790,6 +8576,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -8815,11 +8666,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8830,7 +8681,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8841,7 +8692,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8852,7 +8703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8866,99 +8717,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -8968,8 +8732,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -8986,7 +8750,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9000,11 +8851,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9015,7 +8866,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9026,7 +8877,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9037,7 +8888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9051,7 +8902,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -9069,7 +8920,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -9087,29 +8938,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9123,29 +8956,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9163,7 +8978,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9181,7 +8996,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9199,7 +9014,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9217,7 +9032,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9284,7 +9099,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -9303,7 +9118,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -9322,7 +9137,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -9341,7 +9156,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -9386,7 +9201,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -9405,7 +9220,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -9424,7 +9239,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -9443,7 +9258,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -9488,7 +9303,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -9507,7 +9322,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -9526,7 +9341,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -9545,7 +9360,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -9559,7 +9374,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9577,7 +9392,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9595,61 +9410,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9660,7 +9421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9671,7 +9432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9682,7 +9443,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9696,11 +9457,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9711,7 +9472,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9722,7 +9483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9733,7 +9494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9747,11 +9508,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9762,7 +9523,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9776,11 +9537,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9791,7 +9552,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9805,12 +9566,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -9827,24 +9642,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -9856,7 +9653,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9878,7 +9675,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9900,7 +9697,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9911,7 +9708,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9925,7 +9722,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -9943,7 +9740,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -9958,7 +9755,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9969,7 +9766,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9983,11 +9780,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9998,7 +9795,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10012,11 +9809,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10030,6 +9845,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -10067,7 +9900,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10078,7 +9911,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10089,7 +9922,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10100,7 +9933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10111,7 +9944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10122,7 +9955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10133,7 +9966,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10144,7 +9977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10184,7 +10017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10195,7 +10028,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10206,7 +10039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10217,7 +10050,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10228,7 +10061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10239,7 +10072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10250,7 +10083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10261,7 +10094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10272,7 +10105,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10283,7 +10116,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10294,7 +10127,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10305,7 +10138,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10316,7 +10149,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10327,7 +10160,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10338,7 +10171,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10356,7 +10189,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10367,7 +10200,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10378,7 +10211,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10389,7 +10222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10400,7 +10233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10411,7 +10244,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10422,7 +10255,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10433,7 +10266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10451,7 +10284,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10462,7 +10295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10473,7 +10306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10484,7 +10317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10495,7 +10328,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10506,7 +10339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10517,7 +10350,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -10535,7 +10368,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10553,7 +10386,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10582,7 +10415,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -10618,7 +10451,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10629,7 +10462,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10647,7 +10480,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -10694,17 +10527,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -10714,7 +10536,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10732,8 +10554,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -10750,6 +10572,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -10764,11 +10622,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10782,7 +10640,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -10800,11 +10658,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10818,7 +10676,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -10836,29 +10694,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10872,11 +10712,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10890,7 +10730,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -10941,7 +10781,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -10970,94 +10810,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11075,7 +10832,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11093,7 +10850,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11111,7 +10868,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11129,7 +10886,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11147,23 +10904,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -11176,8 +10922,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -11194,25 +10940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11226,40 +10954,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11273,11 +10972,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11291,7 +10990,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -11414,41 +11113,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -11466,7 +11139,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -11478,6 +11177,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -11485,8 +11203,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -11504,8 +11222,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -11523,8 +11241,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -11543,7 +11261,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -11562,7 +11280,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -11580,8 +11298,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -11590,7 +11308,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -11599,25 +11317,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -11625,26 +11324,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -11656,51 +11336,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -11708,8 +11343,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -11727,8 +11362,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -11741,133 +11376,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -11882,25 +11390,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -11918,7 +11408,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -11936,7 +11553,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -11954,11 +11571,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11972,11 +11589,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11990,7 +11607,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -12008,11 +11625,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12023,7 +11640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12037,11 +11654,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12055,7 +11672,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -12139,7 +11756,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -12190,7 +11807,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -12208,7 +11825,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -12226,7 +11843,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -12244,11 +11861,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -12266,7 +11883,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12277,7 +11894,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12288,7 +11905,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12299,7 +11916,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12350,7 +11967,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12361,7 +11978,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12372,7 +11989,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12383,7 +12000,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12423,7 +12040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12434,7 +12051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12445,7 +12062,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12456,7 +12073,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12503,7 +12120,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12514,7 +12131,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12554,7 +12171,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12565,7 +12182,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12619,7 +12236,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12637,7 +12254,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12655,7 +12272,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12684,7 +12301,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12713,7 +12330,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -12724,7 +12341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -12742,23 +12359,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -12771,10 +12388,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -12782,10 +12399,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -12800,7 +12435,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12811,7 +12497,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12822,7 +12508,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12833,7 +12519,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12844,7 +12530,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12855,7 +12541,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12891,7 +12577,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -12909,74 +12595,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -12993,7 +12617,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13002,6 +12626,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -13016,7 +12695,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13034,7 +12713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13052,7 +12731,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13070,7 +12749,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13088,7 +12767,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13106,7 +12785,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13124,6 +12803,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -13149,11 +12893,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13164,7 +12908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13175,7 +12919,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13186,7 +12930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13200,99 +12944,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -13302,8 +12959,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -13320,7 +12977,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13334,11 +13078,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13349,7 +13093,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13360,7 +13104,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13371,7 +13115,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13385,7 +13129,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -13403,7 +13147,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -13421,29 +13165,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13457,29 +13183,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13497,7 +13205,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13515,7 +13223,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13533,7 +13241,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13551,7 +13259,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13618,7 +13326,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -13637,7 +13345,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -13656,7 +13364,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -13675,7 +13383,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -13720,7 +13428,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -13739,7 +13447,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -13758,7 +13466,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -13777,7 +13485,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -13822,7 +13530,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -13841,7 +13549,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -13860,7 +13568,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -13879,7 +13587,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -13893,7 +13601,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13911,7 +13619,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13929,61 +13637,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13994,7 +13648,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14005,7 +13659,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14016,7 +13670,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14030,11 +13684,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14045,7 +13699,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14056,7 +13710,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14067,7 +13721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14081,11 +13735,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14096,7 +13750,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14110,11 +13764,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14125,7 +13779,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14139,12 +13793,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -14161,24 +13869,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -14190,7 +13880,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14212,7 +13902,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14234,7 +13924,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14245,7 +13935,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14259,7 +13949,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -14277,7 +13967,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -14292,7 +13982,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14303,7 +13993,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14317,11 +14007,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14332,7 +14022,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14346,11 +14036,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14364,6 +14072,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -14401,7 +14127,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14412,7 +14138,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14423,7 +14149,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14434,7 +14160,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14445,7 +14171,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14456,7 +14182,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14467,7 +14193,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14478,7 +14204,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14518,7 +14244,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14529,7 +14255,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14540,7 +14266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14551,7 +14277,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14562,7 +14288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14573,7 +14299,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14584,7 +14310,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14595,7 +14321,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14606,7 +14332,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14617,7 +14343,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14628,7 +14354,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14639,7 +14365,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14650,7 +14376,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14661,7 +14387,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14672,7 +14398,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14690,7 +14416,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14701,7 +14427,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14712,7 +14438,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14723,7 +14449,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14734,7 +14460,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14745,7 +14471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14756,7 +14482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14767,7 +14493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14785,7 +14511,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14796,7 +14522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14807,7 +14533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14818,7 +14544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14829,7 +14555,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14840,7 +14566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14851,7 +14577,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -14869,7 +14595,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14887,7 +14613,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14916,7 +14642,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -14952,7 +14678,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14963,7 +14689,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14981,7 +14707,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -15028,17 +14754,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -15048,7 +14763,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15066,8 +14781,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -15084,6 +14799,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -15098,11 +14849,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15116,7 +14867,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -15134,11 +14885,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15152,7 +14903,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -15170,29 +14921,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15206,11 +14939,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15224,7 +14957,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -15275,7 +15008,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -15304,94 +15037,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15409,7 +15059,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15427,7 +15077,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15445,7 +15095,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15463,7 +15113,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15481,23 +15131,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -15510,8 +15149,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -15528,25 +15167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15560,40 +15181,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15607,11 +15199,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15625,7 +15217,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -15748,41 +15340,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -15800,7 +15366,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -15812,6 +15404,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -15819,8 +15430,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -15838,8 +15449,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -15857,8 +15468,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -15877,7 +15488,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -15896,7 +15507,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -15914,8 +15525,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -15924,7 +15535,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -15933,25 +15544,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -15959,26 +15551,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -15990,51 +15563,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -16042,8 +15570,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -16061,8 +15589,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -16075,133 +15603,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -16216,25 +15617,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -16252,7 +15635,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -16270,7 +15780,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -16288,11 +15798,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16306,11 +15816,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16324,7 +15834,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -16342,11 +15852,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16357,7 +15867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16371,11 +15881,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16389,7 +15899,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -16473,7 +15983,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -16524,7 +16034,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -16542,7 +16052,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -16560,7 +16070,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -16578,11 +16088,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -16600,7 +16110,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16611,7 +16121,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16622,7 +16132,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16633,7 +16143,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16684,7 +16194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16695,7 +16205,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16706,7 +16216,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16717,7 +16227,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16757,7 +16267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16768,7 +16278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16779,7 +16289,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16790,7 +16300,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16837,7 +16347,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16848,7 +16358,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16888,7 +16398,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16899,7 +16409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16953,7 +16463,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16971,7 +16481,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16989,7 +16499,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17018,7 +16528,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17047,7 +16557,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17058,7 +16568,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17076,23 +16586,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -17105,10 +16615,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -17116,10 +16626,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -17134,7 +16662,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17145,7 +16724,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17156,7 +16735,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17167,7 +16746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17178,7 +16757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17189,7 +16768,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17225,7 +16804,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -17243,74 +16822,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -17327,7 +16844,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17336,6 +16853,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -17350,7 +16922,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17368,7 +16940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17386,7 +16958,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17404,7 +16976,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17422,7 +16994,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17440,7 +17012,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17458,6 +17030,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -17483,11 +17120,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17498,7 +17135,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17509,7 +17146,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17520,7 +17157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17534,99 +17171,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -17636,8 +17186,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -17654,7 +17204,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17668,11 +17305,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17683,7 +17320,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17694,7 +17331,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17705,7 +17342,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17719,7 +17356,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -17737,7 +17374,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -17755,29 +17392,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17791,29 +17410,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17831,7 +17432,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17849,7 +17450,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17867,7 +17468,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17885,7 +17486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17952,7 +17553,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -17971,7 +17572,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -17990,7 +17591,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -18009,7 +17610,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -18054,7 +17655,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -18073,7 +17674,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -18092,7 +17693,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -18111,7 +17712,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -18156,7 +17757,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -18175,7 +17776,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -18194,7 +17795,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -18213,7 +17814,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -18227,7 +17828,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18245,7 +17846,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18263,61 +17864,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18328,7 +17875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18339,7 +17886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18350,7 +17897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18364,11 +17911,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18379,7 +17926,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18390,7 +17937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18401,7 +17948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18415,11 +17962,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18430,7 +17977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18444,11 +17991,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18459,7 +18006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18473,12 +18020,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -18495,24 +18096,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -18524,7 +18107,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18546,7 +18129,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18568,7 +18151,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18579,7 +18162,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18593,7 +18176,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -18611,7 +18194,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -18626,7 +18209,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18637,7 +18220,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18651,11 +18234,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18666,7 +18249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18680,11 +18263,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18698,6 +18299,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -18735,7 +18354,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18746,7 +18365,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18757,7 +18376,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18768,7 +18387,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18779,7 +18398,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18790,7 +18409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18801,7 +18420,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18812,7 +18431,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18852,7 +18471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18863,7 +18482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18874,7 +18493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18885,7 +18504,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18896,7 +18515,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18907,7 +18526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18918,7 +18537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18929,7 +18548,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18940,7 +18559,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18951,7 +18570,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18962,7 +18581,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18973,7 +18592,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18984,7 +18603,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18995,7 +18614,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19006,7 +18625,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19024,7 +18643,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19035,7 +18654,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19046,7 +18665,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19057,7 +18676,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19068,7 +18687,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19079,7 +18698,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19090,7 +18709,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19101,7 +18720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19119,7 +18738,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19130,7 +18749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19141,7 +18760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19152,7 +18771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19163,7 +18782,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19174,7 +18793,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19185,7 +18804,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -19203,7 +18822,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19221,7 +18840,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19250,7 +18869,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19286,7 +18905,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19297,7 +18916,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19315,7 +18934,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -19362,17 +18981,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -19382,7 +18990,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19400,8 +19008,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -19418,6 +19026,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -19432,11 +19076,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19450,7 +19094,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -19468,11 +19112,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19486,7 +19130,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -19504,29 +19148,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19540,11 +19166,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19558,7 +19184,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -19609,7 +19235,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -19638,94 +19264,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19743,7 +19286,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19761,7 +19304,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19779,7 +19322,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19797,7 +19340,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19815,23 +19358,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -19844,8 +19376,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -19862,25 +19394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19894,40 +19408,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19941,11 +19426,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19959,7 +19444,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -20082,41 +19567,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -20134,7 +19593,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -20146,6 +19631,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -20153,8 +19657,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -20172,8 +19676,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -20191,8 +19695,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -20211,7 +19715,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -20230,7 +19734,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -20248,8 +19752,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -20258,7 +19762,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -20267,25 +19771,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -20293,26 +19778,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -20324,51 +19790,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -20376,8 +19797,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -20395,8 +19816,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -20409,133 +19830,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -20550,25 +19844,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -20586,7 +19862,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -20604,7 +20007,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -20622,11 +20025,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20640,11 +20043,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20658,7 +20061,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -20676,11 +20079,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20691,7 +20094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20705,11 +20108,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20723,7 +20126,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -20807,7 +20210,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -20858,7 +20261,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -20876,7 +20279,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -20894,7 +20297,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -20912,11 +20315,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -20934,7 +20337,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20945,7 +20348,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20956,7 +20359,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20967,7 +20370,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21018,7 +20421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21029,7 +20432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21040,7 +20443,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21051,7 +20454,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21091,7 +20494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21102,7 +20505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21113,7 +20516,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21124,7 +20527,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21171,7 +20574,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21182,7 +20585,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21222,7 +20625,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21233,7 +20636,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21287,7 +20690,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21305,7 +20708,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21323,7 +20726,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21352,7 +20755,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21381,7 +20784,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21392,7 +20795,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21410,23 +20813,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -21439,10 +20842,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -21450,10 +20853,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -21468,7 +20889,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21479,7 +20951,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21490,7 +20962,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21501,7 +20973,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21512,7 +20984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21523,7 +20995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21559,7 +21031,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -21577,74 +21049,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -21661,7 +21071,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21670,6 +21080,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -21684,7 +21149,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21702,7 +21167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21720,7 +21185,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21738,7 +21203,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21756,7 +21221,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21774,7 +21239,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21792,6 +21257,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -21817,11 +21347,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21832,7 +21362,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21843,7 +21373,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21854,7 +21384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21868,99 +21398,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -21970,8 +21413,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -21988,7 +21431,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22002,11 +21532,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22017,7 +21547,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22028,7 +21558,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22039,7 +21569,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22053,7 +21583,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -22071,7 +21601,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -22089,29 +21619,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22125,29 +21637,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22165,7 +21659,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22183,7 +21677,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22201,7 +21695,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22219,7 +21713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22286,7 +21780,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -22305,7 +21799,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -22324,7 +21818,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -22343,7 +21837,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -22388,7 +21882,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -22407,7 +21901,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -22426,7 +21920,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -22445,7 +21939,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -22490,7 +21984,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -22509,7 +22003,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -22528,7 +22022,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -22547,7 +22041,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -22561,7 +22055,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22579,7 +22073,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22597,61 +22091,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22662,7 +22102,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22673,7 +22113,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22684,7 +22124,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22698,11 +22138,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22713,7 +22153,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22724,7 +22164,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22735,7 +22175,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22749,11 +22189,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22764,7 +22204,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22778,11 +22218,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22793,7 +22233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22807,12 +22247,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -22829,24 +22323,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -22858,7 +22334,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22880,7 +22356,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22902,7 +22378,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22913,7 +22389,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22927,7 +22403,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -22945,7 +22421,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -22960,7 +22436,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22971,7 +22447,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22985,11 +22461,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23000,7 +22476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23014,11 +22490,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23032,6 +22526,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -23069,7 +22581,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23080,7 +22592,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23091,7 +22603,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23102,7 +22614,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23113,7 +22625,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23124,7 +22636,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23135,7 +22647,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23146,7 +22658,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23186,7 +22698,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23197,7 +22709,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23208,7 +22720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23219,7 +22731,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23230,7 +22742,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23241,7 +22753,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23252,7 +22764,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23263,7 +22775,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23274,7 +22786,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23285,7 +22797,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23296,7 +22808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23307,7 +22819,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23318,7 +22830,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23329,7 +22841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23340,7 +22852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23358,7 +22870,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23369,7 +22881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23380,7 +22892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23391,7 +22903,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23402,7 +22914,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23413,7 +22925,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23424,7 +22936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23435,7 +22947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23453,7 +22965,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23464,7 +22976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23475,7 +22987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23486,7 +22998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23497,7 +23009,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23508,7 +23020,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23519,7 +23031,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -23537,7 +23049,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23555,7 +23067,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23584,7 +23096,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -23620,7 +23132,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23631,7 +23143,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23649,7 +23161,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -23696,17 +23208,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -23716,7 +23217,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23734,8 +23235,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -23752,6 +23253,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -23766,11 +23303,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23784,7 +23321,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -23802,11 +23339,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23820,7 +23357,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -23838,29 +23375,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23874,11 +23393,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23892,7 +23411,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -23943,7 +23462,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -23972,94 +23491,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24077,7 +23513,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24095,7 +23531,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24113,7 +23549,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24131,7 +23567,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24149,23 +23585,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -24178,8 +23603,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -24196,25 +23621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24228,40 +23635,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24275,11 +23653,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24293,7 +23671,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -24416,41 +23794,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -24468,7 +23820,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -24480,6 +23858,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -24487,8 +23884,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -24506,8 +23903,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -24525,8 +23922,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -24545,7 +23942,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -24564,7 +23961,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -24582,8 +23979,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -24592,7 +23989,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -24601,25 +23998,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -24627,26 +24005,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -24658,51 +24017,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -24710,8 +24024,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -24729,8 +24043,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -24743,133 +24057,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -24884,25 +24071,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -24920,7 +24089,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -24938,7 +24234,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -24956,11 +24252,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24974,11 +24270,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24992,7 +24288,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -25010,11 +24306,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25025,7 +24321,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25039,11 +24335,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25057,7 +24353,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -25141,7 +24437,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -25192,7 +24488,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -25210,7 +24506,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -25228,7 +24524,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -25246,11 +24542,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -25268,7 +24564,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25279,7 +24575,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25290,7 +24586,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25301,7 +24597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25352,7 +24648,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25363,7 +24659,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25374,7 +24670,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25385,7 +24681,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25425,7 +24721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25436,7 +24732,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25447,7 +24743,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25458,7 +24754,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25505,7 +24801,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25516,7 +24812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25556,7 +24852,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25567,7 +24863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25621,7 +24917,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25639,7 +24935,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25657,7 +24953,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25686,7 +24982,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25715,7 +25011,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -25726,7 +25022,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -25744,23 +25040,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -25773,10 +25069,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -25784,10 +25080,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -25802,7 +25116,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25813,7 +25178,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25824,7 +25189,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25835,7 +25200,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25846,7 +25211,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25857,7 +25222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25893,7 +25258,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -25911,74 +25276,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -25995,7 +25298,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26004,6 +25307,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -26018,7 +25376,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26036,7 +25394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26054,7 +25412,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26072,7 +25430,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26090,7 +25448,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26108,7 +25466,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26126,6 +25484,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -26151,11 +25574,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26166,7 +25589,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26177,7 +25600,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26188,7 +25611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26202,99 +25625,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -26304,8 +25640,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -26322,7 +25658,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26336,11 +25759,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26351,7 +25774,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26362,7 +25785,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26373,7 +25796,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26387,7 +25810,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -26405,7 +25828,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -26423,29 +25846,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26459,29 +25864,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26499,7 +25886,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26517,7 +25904,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26535,7 +25922,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26553,7 +25940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26620,7 +26007,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -26639,7 +26026,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -26658,7 +26045,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -26677,7 +26064,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -26722,7 +26109,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -26741,7 +26128,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -26760,7 +26147,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -26779,7 +26166,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -26824,7 +26211,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -26843,7 +26230,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -26862,7 +26249,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -26881,7 +26268,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -26895,7 +26282,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26913,7 +26300,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26931,61 +26318,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26996,7 +26329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27007,7 +26340,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27018,7 +26351,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27032,11 +26365,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27047,7 +26380,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27058,7 +26391,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27069,7 +26402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27083,11 +26416,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27098,7 +26431,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27112,11 +26445,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27127,7 +26460,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27141,12 +26474,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -27163,24 +26550,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -27192,7 +26561,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27214,7 +26583,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27236,7 +26605,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27247,7 +26616,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27261,7 +26630,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -27279,7 +26648,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -27294,7 +26663,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27305,7 +26674,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27319,11 +26688,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27334,7 +26703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27348,11 +26717,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27366,6 +26753,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -27403,7 +26808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27414,7 +26819,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27425,7 +26830,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27436,7 +26841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27447,7 +26852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27458,7 +26863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27469,7 +26874,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27480,7 +26885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27520,7 +26925,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27531,7 +26936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27542,7 +26947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27553,7 +26958,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27564,7 +26969,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27575,7 +26980,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27586,7 +26991,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27597,7 +27002,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27608,7 +27013,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27619,7 +27024,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27630,7 +27035,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27641,7 +27046,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27652,7 +27057,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27663,7 +27068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27674,7 +27079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27692,7 +27097,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27703,7 +27108,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27714,7 +27119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27725,7 +27130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27736,7 +27141,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27747,7 +27152,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27758,7 +27163,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27769,7 +27174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27787,7 +27192,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27798,7 +27203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27809,7 +27214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27820,7 +27225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27831,7 +27236,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27842,7 +27247,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27853,7 +27258,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -27871,7 +27276,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27889,7 +27294,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27918,7 +27323,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -27954,7 +27359,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27965,7 +27370,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27983,7 +27388,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -28030,17 +27435,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -28050,7 +27444,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28068,8 +27462,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -28086,6 +27480,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -28100,11 +27530,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28118,7 +27548,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -28136,11 +27566,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28154,7 +27584,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -28172,29 +27602,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28208,11 +27620,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28226,7 +27638,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -28277,7 +27689,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -28306,94 +27718,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28411,7 +27740,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28429,7 +27758,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28447,7 +27776,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28465,7 +27794,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28483,23 +27812,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -28512,8 +27830,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -28530,25 +27848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28562,40 +27862,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28609,11 +27880,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28627,7 +27898,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -28750,41 +28021,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -28802,7 +28047,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -28814,6 +28085,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -28821,8 +28111,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -28840,8 +28130,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -28859,8 +28149,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -28879,7 +28169,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -28898,7 +28188,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -28916,8 +28206,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -28926,7 +28216,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -28935,25 +28225,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -28961,26 +28232,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -28992,51 +28244,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -29044,8 +28251,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -29063,8 +28270,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -29077,133 +28284,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -29218,25 +28298,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -29254,7 +28316,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -29272,7 +28461,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -29290,11 +28479,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29308,11 +28497,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29326,7 +28515,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -29344,11 +28533,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29359,7 +28548,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29373,11 +28562,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29391,7 +28580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -29475,7 +28664,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -29526,7 +28715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -29544,7 +28733,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -29562,7 +28751,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -29580,11 +28769,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -29602,7 +28791,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29613,7 +28802,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29624,7 +28813,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29635,7 +28824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29686,7 +28875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29697,7 +28886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29708,7 +28897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29719,7 +28908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29759,7 +28948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29770,7 +28959,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29781,7 +28970,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29792,7 +28981,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29839,7 +29028,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29850,7 +29039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29890,7 +29079,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29901,7 +29090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29955,7 +29144,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29973,7 +29162,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29991,7 +29180,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30020,7 +29209,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30049,7 +29238,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30060,7 +29249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30078,23 +29267,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -30107,10 +29296,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -30118,10 +29307,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -30136,7 +29343,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30147,7 +29405,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30158,7 +29416,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30169,7 +29427,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30180,7 +29438,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30191,7 +29449,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30227,7 +29485,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -30245,74 +29503,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -30329,7 +29525,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30338,6 +29534,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -30352,7 +29603,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30370,7 +29621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30388,7 +29639,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30406,7 +29657,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30424,7 +29675,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30442,7 +29693,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30460,6 +29711,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -30485,11 +29801,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30500,7 +29816,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30511,7 +29827,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30522,7 +29838,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30536,99 +29852,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -30638,8 +29867,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -30656,7 +29885,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30670,11 +29986,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30685,7 +30001,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30696,7 +30012,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30707,7 +30023,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30721,7 +30037,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -30739,7 +30055,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -30757,29 +30073,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30793,29 +30091,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30833,7 +30113,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30851,7 +30131,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30869,7 +30149,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30887,7 +30167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30954,7 +30234,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -30973,7 +30253,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -30992,7 +30272,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -31011,7 +30291,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -31056,7 +30336,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -31075,7 +30355,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -31094,7 +30374,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -31113,7 +30393,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -31158,7 +30438,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -31177,7 +30457,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -31196,7 +30476,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -31215,7 +30495,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -31229,7 +30509,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31247,7 +30527,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31265,61 +30545,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31330,7 +30556,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31341,7 +30567,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31352,7 +30578,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31366,11 +30592,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31381,7 +30607,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31392,7 +30618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31403,7 +30629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31417,11 +30643,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31432,7 +30658,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31446,11 +30672,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31461,7 +30687,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31475,12 +30701,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -31497,24 +30777,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -31526,7 +30788,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31548,7 +30810,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31570,7 +30832,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31581,7 +30843,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31595,7 +30857,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -31613,7 +30875,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -31628,7 +30890,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31639,7 +30901,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31653,11 +30915,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31668,7 +30930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31682,11 +30944,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31700,6 +30980,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -31737,7 +31035,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31748,7 +31046,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31759,7 +31057,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31770,7 +31068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31781,7 +31079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31792,7 +31090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31803,7 +31101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31814,7 +31112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31854,7 +31152,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31865,7 +31163,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31876,7 +31174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31887,7 +31185,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31898,7 +31196,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31909,7 +31207,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31920,7 +31218,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31931,7 +31229,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31942,7 +31240,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31953,7 +31251,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31964,7 +31262,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31975,7 +31273,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31986,7 +31284,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31997,7 +31295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32008,7 +31306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32026,7 +31324,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32037,7 +31335,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32048,7 +31346,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32059,7 +31357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32070,7 +31368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32081,7 +31379,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32092,7 +31390,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32103,7 +31401,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32121,7 +31419,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32132,7 +31430,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32143,7 +31441,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32154,7 +31452,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32165,7 +31463,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32176,7 +31474,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32187,7 +31485,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -32205,7 +31503,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32223,7 +31521,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32252,7 +31550,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32288,7 +31586,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -32299,7 +31597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -32317,7 +31615,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -32364,17 +31662,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -32384,7 +31671,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32402,8 +31689,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -32420,6 +31707,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -32434,11 +31757,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32452,7 +31775,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -32470,11 +31793,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32488,7 +31811,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -32506,29 +31829,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32542,11 +31847,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32560,7 +31865,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -32611,7 +31916,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -32640,94 +31945,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32745,7 +31967,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32763,7 +31985,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32781,7 +32003,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32799,7 +32021,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32817,23 +32039,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -32846,8 +32057,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -32864,25 +32075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32896,40 +32089,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32943,11 +32107,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32961,7 +32125,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -33084,41 +32248,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -33136,7 +32274,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -33148,6 +32312,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -33155,8 +32338,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -33174,8 +32357,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -33193,8 +32376,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -33213,7 +32396,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -33232,7 +32415,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -33250,8 +32433,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -33260,7 +32443,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -33269,25 +32452,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -33295,26 +32459,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -33326,51 +32471,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -33378,8 +32478,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -33397,8 +32497,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -33411,133 +32511,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -33552,25 +32525,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -33588,7 +32543,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -33606,7 +32688,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -33624,11 +32706,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33642,11 +32724,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33660,7 +32742,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -33678,11 +32760,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33693,7 +32775,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33707,11 +32789,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33725,7 +32807,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -33809,7 +32891,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -33860,7 +32942,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -33878,7 +32960,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -33896,7 +32978,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -33914,11 +32996,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -33936,7 +33018,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33947,7 +33029,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33958,7 +33040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33969,7 +33051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34020,7 +33102,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34031,7 +33113,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34042,7 +33124,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34053,7 +33135,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34093,7 +33175,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34104,7 +33186,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34115,7 +33197,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34126,7 +33208,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34173,7 +33255,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34184,7 +33266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34224,7 +33306,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34235,7 +33317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34289,7 +33371,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34307,7 +33389,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34325,7 +33407,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34354,7 +33436,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34383,7 +33465,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -34394,7 +33476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -34412,23 +33494,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -34441,10 +33523,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -34452,10 +33534,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -34470,7 +33570,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34481,7 +33632,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34492,7 +33643,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34503,7 +33654,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34514,7 +33665,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34525,7 +33676,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34561,7 +33712,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -34579,74 +33730,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -34663,7 +33752,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34672,6 +33761,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -34686,7 +33830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34704,7 +33848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34722,7 +33866,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34740,7 +33884,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34758,7 +33902,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34776,7 +33920,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34794,6 +33938,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -34819,11 +34028,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34834,7 +34043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34845,7 +34054,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34856,7 +34065,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34870,99 +34079,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -34972,8 +34094,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -34990,7 +34112,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35004,11 +34213,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35019,7 +34228,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35030,7 +34239,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35041,7 +34250,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35055,7 +34264,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -35073,7 +34282,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -35091,29 +34300,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35127,29 +34318,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35167,7 +34340,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35185,7 +34358,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35203,7 +34376,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35221,7 +34394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35288,7 +34461,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -35307,7 +34480,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -35326,7 +34499,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -35345,7 +34518,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -35390,7 +34563,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -35409,7 +34582,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -35428,7 +34601,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -35447,7 +34620,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -35492,7 +34665,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -35511,7 +34684,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -35530,7 +34703,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -35549,7 +34722,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -35563,7 +34736,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35581,7 +34754,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35599,61 +34772,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35664,7 +34783,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35675,7 +34794,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35686,7 +34805,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35700,11 +34819,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35715,7 +34834,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35726,7 +34845,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35737,7 +34856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35751,11 +34870,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35766,7 +34885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35780,11 +34899,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35795,7 +34914,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35809,12 +34928,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -35831,24 +35004,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -35860,7 +35015,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35882,7 +35037,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35904,7 +35059,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35915,7 +35070,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35929,7 +35084,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -35947,7 +35102,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -35962,7 +35117,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35973,7 +35128,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35987,11 +35142,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36002,7 +35157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36016,11 +35171,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36034,6 +35207,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -36071,7 +35262,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36082,7 +35273,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36093,7 +35284,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36104,7 +35295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36115,7 +35306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36126,7 +35317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36137,7 +35328,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36148,7 +35339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36188,7 +35379,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36199,7 +35390,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36210,7 +35401,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36221,7 +35412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36232,7 +35423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36243,7 +35434,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36254,7 +35445,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36265,7 +35456,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36276,7 +35467,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36287,7 +35478,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36298,7 +35489,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36309,7 +35500,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36320,7 +35511,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36331,7 +35522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36342,7 +35533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36360,7 +35551,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36371,7 +35562,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36382,7 +35573,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36393,7 +35584,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36404,7 +35595,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36415,7 +35606,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36426,7 +35617,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36437,7 +35628,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36455,7 +35646,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36466,7 +35657,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36477,7 +35668,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36488,7 +35679,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36499,7 +35690,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36510,7 +35701,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36521,7 +35712,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -36539,7 +35730,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36557,7 +35748,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36586,7 +35777,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -36622,7 +35813,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36633,7 +35824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36651,7 +35842,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -36698,17 +35889,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -36718,7 +35898,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36736,8 +35916,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -36754,6 +35934,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -36768,11 +35984,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36786,7 +36002,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -36804,11 +36020,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36822,7 +36038,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -36840,29 +36056,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36876,11 +36074,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36894,7 +36092,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -36945,7 +36143,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -36974,94 +36172,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37079,7 +36194,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37097,7 +36212,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37115,7 +36230,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37133,7 +36248,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37151,23 +36266,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -37180,8 +36284,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -37198,25 +36302,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37230,40 +36316,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37277,11 +36334,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37295,7 +36352,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -37418,41 +36475,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -37470,7 +36501,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -37482,6 +36539,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -37489,8 +36565,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -37508,8 +36584,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -37527,8 +36603,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -37547,7 +36623,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -37566,7 +36642,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -37584,8 +36660,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -37594,7 +36670,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -37603,25 +36679,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -37629,26 +36686,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -37660,51 +36698,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -37712,8 +36705,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -37731,8 +36724,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -37745,133 +36738,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -37886,25 +36752,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -37922,7 +36770,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -37940,7 +36915,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -37958,11 +36933,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -37976,11 +36951,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -37994,7 +36969,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -38012,11 +36987,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38027,7 +37002,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38041,11 +37016,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38059,7 +37034,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -38143,7 +37118,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -38194,7 +37169,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -38212,7 +37187,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -38230,7 +37205,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -38248,11 +37223,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -38270,7 +37245,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38281,7 +37256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38292,7 +37267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38303,7 +37278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38354,7 +37329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38365,7 +37340,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38376,7 +37351,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38387,7 +37362,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38427,7 +37402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38438,7 +37413,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38449,7 +37424,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38460,7 +37435,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38507,7 +37482,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38518,7 +37493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38558,7 +37533,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38569,7 +37544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38623,7 +37598,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38641,7 +37616,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38659,7 +37634,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38688,7 +37663,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38717,7 +37692,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -38728,7 +37703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -38746,23 +37721,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -38775,10 +37750,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -38786,10 +37761,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -38804,7 +37797,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38815,7 +37859,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38826,7 +37870,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38837,7 +37881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38848,7 +37892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38859,7 +37903,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38895,7 +37939,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -38913,74 +37957,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -38997,7 +37979,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39006,6 +37988,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -39020,7 +38057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39038,7 +38075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39056,7 +38093,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39074,7 +38111,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39092,7 +38129,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39110,7 +38147,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39128,6 +38165,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -39153,11 +38255,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39168,7 +38270,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39179,7 +38281,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39190,7 +38292,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39204,99 +38306,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -39306,8 +38321,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -39324,7 +38339,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39338,11 +38440,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39353,7 +38455,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39364,7 +38466,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39375,7 +38477,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39389,7 +38491,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -39407,7 +38509,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -39425,29 +38527,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39461,29 +38545,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39501,7 +38567,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39519,7 +38585,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39537,7 +38603,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39555,7 +38621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39622,7 +38688,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -39641,7 +38707,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -39660,7 +38726,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -39679,7 +38745,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -39724,7 +38790,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -39743,7 +38809,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -39762,7 +38828,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -39781,7 +38847,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -39826,7 +38892,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -39845,7 +38911,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -39864,7 +38930,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -39883,7 +38949,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -39897,7 +38963,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39915,7 +38981,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39933,61 +38999,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39998,7 +39010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40009,7 +39021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40020,7 +39032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40034,11 +39046,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40049,7 +39061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40060,7 +39072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40071,7 +39083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40085,11 +39097,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40100,7 +39112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40114,11 +39126,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40129,7 +39141,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40143,12 +39155,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -40165,24 +39231,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -40194,7 +39242,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40216,7 +39264,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40238,7 +39286,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40249,7 +39297,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40263,7 +39311,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -40281,7 +39329,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -40296,7 +39344,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40307,7 +39355,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40321,11 +39369,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40336,7 +39384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40350,11 +39398,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40368,6 +39434,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -40405,7 +39489,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40416,7 +39500,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40427,7 +39511,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40438,7 +39522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40449,7 +39533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40460,7 +39544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40471,7 +39555,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40482,7 +39566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40522,7 +39606,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40533,7 +39617,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40544,7 +39628,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40555,7 +39639,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40566,7 +39650,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40577,7 +39661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40588,7 +39672,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40599,7 +39683,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40610,7 +39694,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40621,7 +39705,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40632,7 +39716,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40643,7 +39727,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40654,7 +39738,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40665,7 +39749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40676,7 +39760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40694,7 +39778,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40705,7 +39789,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40716,7 +39800,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40727,7 +39811,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40738,7 +39822,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40749,7 +39833,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40760,7 +39844,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40771,7 +39855,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40789,7 +39873,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40800,7 +39884,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40811,7 +39895,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40822,7 +39906,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40833,7 +39917,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40844,7 +39928,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40855,7 +39939,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -40873,7 +39957,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40891,7 +39975,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40920,7 +40004,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -40956,7 +40040,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40967,7 +40051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40985,7 +40069,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -41032,17 +40116,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -41052,7 +40125,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41070,8 +40143,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -41088,6 +40161,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -41102,11 +40211,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41120,7 +40229,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -41138,11 +40247,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41156,7 +40265,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -41174,29 +40283,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41210,11 +40301,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41228,7 +40319,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -41279,7 +40370,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -41308,94 +40399,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41413,7 +40421,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41431,7 +40439,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41449,7 +40457,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41467,7 +40475,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41485,23 +40493,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -41514,8 +40511,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -41532,25 +40529,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41564,40 +40543,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41611,11 +40561,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41629,7 +40579,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -41752,41 +40702,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -41804,7 +40728,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -41816,6 +40766,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -41823,8 +40792,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -41842,8 +40811,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -41861,8 +40830,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -41881,7 +40850,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -41900,7 +40869,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -41918,8 +40887,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -41928,7 +40897,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -41937,25 +40906,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -41963,26 +40913,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -41994,51 +40925,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -42046,8 +40932,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -42065,8 +40951,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -42079,133 +40965,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -42220,25 +40979,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -42256,7 +40997,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -42274,7 +41142,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -42292,11 +41160,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42310,11 +41178,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42328,7 +41196,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -42346,11 +41214,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42361,7 +41229,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42375,11 +41243,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42393,7 +41261,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -42477,7 +41345,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -42528,7 +41396,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -42546,7 +41414,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -42564,7 +41432,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -42582,11 +41450,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -42604,7 +41472,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42615,7 +41483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42626,7 +41494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42637,7 +41505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42688,7 +41556,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42699,7 +41567,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42710,7 +41578,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42721,7 +41589,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42761,7 +41629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42772,7 +41640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42783,7 +41651,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42794,7 +41662,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42841,7 +41709,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42852,7 +41720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42892,7 +41760,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42903,7 +41771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42957,7 +41825,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42975,7 +41843,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42993,7 +41861,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43022,7 +41890,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43051,7 +41919,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43062,7 +41930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43080,23 +41948,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -43109,10 +41977,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -43120,10 +41988,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -43138,7 +42024,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43149,7 +42086,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43160,7 +42097,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43171,7 +42108,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43182,7 +42119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43193,7 +42130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43229,7 +42166,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -43247,74 +42184,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -43331,7 +42206,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43340,6 +42215,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -43354,7 +42284,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43372,7 +42302,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43390,7 +42320,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43408,7 +42338,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43426,7 +42356,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43444,7 +42374,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43462,6 +42392,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -43487,11 +42482,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43502,7 +42497,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43513,7 +42508,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43524,7 +42519,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43538,99 +42533,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -43640,8 +42548,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -43658,7 +42566,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43672,11 +42667,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43687,7 +42682,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43698,7 +42693,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43709,7 +42704,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43723,7 +42718,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -43741,7 +42736,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -43759,29 +42754,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43795,29 +42772,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43835,7 +42794,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43853,7 +42812,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43871,7 +42830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43889,7 +42848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43956,7 +42915,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -43975,7 +42934,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -43994,7 +42953,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -44013,7 +42972,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -44058,7 +43017,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -44077,7 +43036,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -44096,7 +43055,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -44115,7 +43074,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -44160,7 +43119,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -44179,7 +43138,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -44198,7 +43157,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -44217,7 +43176,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -44231,7 +43190,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44249,7 +43208,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44267,61 +43226,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44332,7 +43237,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44343,7 +43248,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44354,7 +43259,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44368,11 +43273,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44383,7 +43288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44394,7 +43299,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44405,7 +43310,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44419,11 +43324,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44434,7 +43339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44448,11 +43353,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44463,7 +43368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44477,12 +43382,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -44499,24 +43458,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -44528,7 +43469,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44550,7 +43491,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44572,7 +43513,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44583,7 +43524,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44597,7 +43538,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -44615,7 +43556,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -44630,7 +43571,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44641,7 +43582,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44655,11 +43596,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44670,7 +43611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44684,11 +43625,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44702,6 +43661,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -44739,7 +43716,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44750,7 +43727,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44761,7 +43738,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44772,7 +43749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44783,7 +43760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44794,7 +43771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44805,7 +43782,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44816,7 +43793,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44856,7 +43833,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44867,7 +43844,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44878,7 +43855,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44889,7 +43866,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44900,7 +43877,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44911,7 +43888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44922,7 +43899,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44933,7 +43910,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44944,7 +43921,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44955,7 +43932,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44966,7 +43943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44977,7 +43954,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44988,7 +43965,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44999,7 +43976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45010,7 +43987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45028,7 +44005,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45039,7 +44016,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45050,7 +44027,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45061,7 +44038,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45072,7 +44049,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45083,7 +44060,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45094,7 +44071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45105,7 +44082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45123,7 +44100,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45134,7 +44111,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45145,7 +44122,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45156,7 +44133,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45167,7 +44144,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45178,7 +44155,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45189,7 +44166,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -45207,7 +44184,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45225,7 +44202,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45254,7 +44231,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45290,7 +44267,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -45301,7 +44278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -45319,7 +44296,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -45366,17 +44343,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -45386,7 +44352,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45404,8 +44370,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -45422,6 +44388,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -45436,11 +44438,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45454,7 +44456,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -45472,11 +44474,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45490,7 +44492,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -45508,29 +44510,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45544,11 +44528,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45562,7 +44546,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -45613,7 +44597,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -45642,94 +44626,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45747,7 +44648,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45765,7 +44666,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45783,7 +44684,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45801,7 +44702,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45819,23 +44720,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -45848,8 +44738,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -45866,25 +44756,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45898,40 +44770,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45945,11 +44788,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45963,7 +44806,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -46086,41 +44929,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -46138,7 +44955,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -46150,6 +44993,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -46157,8 +45019,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -46176,8 +45038,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -46195,8 +45057,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -46215,7 +45077,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -46234,7 +45096,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -46252,8 +45114,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -46262,7 +45124,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -46271,25 +45133,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -46297,26 +45140,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -46328,51 +45152,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -46380,8 +45159,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -46399,8 +45178,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -46413,133 +45192,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -46554,25 +45206,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -46590,7 +45224,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -46608,7 +45369,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -46626,11 +45387,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46644,11 +45405,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46662,7 +45423,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -46680,11 +45441,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46695,7 +45456,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46709,11 +45470,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46727,7 +45488,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -46811,7 +45572,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -46862,7 +45623,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -46880,7 +45641,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -46898,7 +45659,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -46916,11 +45677,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -46938,7 +45699,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46949,7 +45710,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46960,7 +45721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46971,7 +45732,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47022,7 +45783,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47033,7 +45794,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47044,7 +45805,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47055,7 +45816,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47095,7 +45856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47106,7 +45867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47117,7 +45878,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47128,7 +45889,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47175,7 +45936,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47186,7 +45947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47226,7 +45987,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47237,7 +45998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47291,7 +46052,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47309,7 +46070,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47327,7 +46088,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47356,7 +46117,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47385,7 +46146,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -47396,7 +46157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -47414,23 +46175,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -47443,10 +46204,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -47454,10 +46215,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -47472,7 +46251,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47483,7 +46313,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47494,7 +46324,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47505,7 +46335,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47516,7 +46346,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47527,7 +46357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47563,7 +46393,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -47581,74 +46411,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -47665,7 +46433,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47674,6 +46442,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -47688,7 +46511,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47706,7 +46529,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47724,7 +46547,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47742,7 +46565,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47760,7 +46583,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47778,7 +46601,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47796,6 +46619,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -47821,11 +46709,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47836,7 +46724,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47847,7 +46735,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47858,7 +46746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47872,99 +46760,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -47974,8 +46775,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -47992,7 +46793,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48006,11 +46894,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48021,7 +46909,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48032,7 +46920,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48043,7 +46931,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48057,7 +46945,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -48075,7 +46963,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -48093,29 +46981,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48129,29 +46999,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48169,7 +47021,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48187,7 +47039,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48205,7 +47057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48223,7 +47075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48290,7 +47142,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -48309,7 +47161,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -48328,7 +47180,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -48347,7 +47199,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -48392,7 +47244,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -48411,7 +47263,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -48430,7 +47282,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -48449,7 +47301,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -48494,7 +47346,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -48513,7 +47365,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -48532,7 +47384,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -48551,7 +47403,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -48565,7 +47417,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48583,7 +47435,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48601,61 +47453,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48666,7 +47464,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48677,7 +47475,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48688,7 +47486,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48702,11 +47500,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48717,7 +47515,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48728,7 +47526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48739,7 +47537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48753,11 +47551,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48768,7 +47566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48782,11 +47580,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48797,7 +47595,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48811,12 +47609,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -48833,24 +47685,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -48862,7 +47696,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48884,7 +47718,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48906,7 +47740,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48917,7 +47751,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48931,7 +47765,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -48949,7 +47783,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -48964,7 +47798,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48975,7 +47809,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48989,11 +47823,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49004,7 +47838,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49018,11 +47852,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49036,6 +47888,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -49073,7 +47943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49084,7 +47954,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49095,7 +47965,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49106,7 +47976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49117,7 +47987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49128,7 +47998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49139,7 +48009,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49150,7 +48020,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49190,7 +48060,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49201,7 +48071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49212,7 +48082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49223,7 +48093,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49234,7 +48104,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49245,7 +48115,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49256,7 +48126,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49267,7 +48137,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49278,7 +48148,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49289,7 +48159,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49300,7 +48170,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49311,7 +48181,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49322,7 +48192,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49333,7 +48203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49344,7 +48214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49362,7 +48232,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49373,7 +48243,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49384,7 +48254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49395,7 +48265,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49406,7 +48276,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49417,7 +48287,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49428,7 +48298,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49439,7 +48309,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49457,7 +48327,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49468,7 +48338,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49479,7 +48349,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49490,7 +48360,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49501,7 +48371,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49512,7 +48382,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49523,7 +48393,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -49541,7 +48411,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49559,7 +48429,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49588,7 +48458,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -49624,7 +48494,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49635,7 +48505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49653,7 +48523,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -49700,17 +48570,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -49720,7 +48579,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49738,8 +48597,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -49756,6 +48615,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -49770,11 +48665,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49788,7 +48683,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -49806,11 +48701,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49824,7 +48719,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -49842,29 +48737,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49878,11 +48755,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49896,7 +48773,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -49947,7 +48824,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -49976,94 +48853,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50081,7 +48875,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50099,7 +48893,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50117,7 +48911,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50135,7 +48929,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50153,23 +48947,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -50182,8 +48965,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -50200,25 +48983,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50232,40 +48997,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50279,11 +49015,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50297,7 +49033,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -50420,41 +49156,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -50472,7 +49182,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -50484,6 +49220,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -50491,8 +49246,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -50510,8 +49265,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -50529,8 +49284,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -50549,7 +49304,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -50568,7 +49323,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -50586,8 +49341,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -50596,7 +49351,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -50605,25 +49360,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -50631,26 +49367,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -50662,51 +49379,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -50714,8 +49386,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -50733,8 +49405,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -50747,133 +49419,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -50888,25 +49433,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -50924,7 +49451,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -50942,7 +49596,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -50960,11 +49614,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -50978,11 +49632,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -50996,7 +49650,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -51014,11 +49668,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51029,7 +49683,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51043,11 +49697,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51061,7 +49715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -51145,7 +49799,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -51196,7 +49850,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -51214,7 +49868,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -51232,7 +49886,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -51250,11 +49904,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -51272,7 +49926,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51283,7 +49937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51294,7 +49948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51305,7 +49959,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51356,7 +50010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51367,7 +50021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51378,7 +50032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51389,7 +50043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51429,7 +50083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51440,7 +50094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51451,7 +50105,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51462,7 +50116,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51509,7 +50163,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51520,7 +50174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51560,7 +50214,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51571,7 +50225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51625,7 +50279,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51643,7 +50297,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51661,7 +50315,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51690,7 +50344,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51719,7 +50373,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -51730,7 +50384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -51748,23 +50402,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -51777,10 +50431,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -51788,10 +50442,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -51806,7 +50478,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51817,7 +50540,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51828,7 +50551,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51839,7 +50562,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51850,7 +50573,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51861,7 +50584,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51897,7 +50620,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -51915,74 +50638,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -51999,7 +50660,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -52008,6 +50669,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -52047,7 +50763,7 @@
               {
                 "action_name": "act_0",
                 "action_handle": 536870914,
-                "table_name": "tbl_act_17",
+                "table_name": "tbl_act_15",
                 "next_table": 0,
                 "next_table_full": 16,
                 "vliw_instruction": 1,
@@ -52086,7 +50802,15 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W8" },
+              "src": [
+                { "type": "phv", "name": "W6" },
+                { "type": "phv", "name": "W7" }
               ]
             }
           ]
@@ -52109,7 +50833,7 @@
     {
       "direction": "egress",
       "handle": 16777218,
-      "name": "tbl_act_14",
+      "name": "tbl_act_13",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -52168,7 +50892,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 3 ],
+            "result_physical_buses": [ 2 ],
             "ternary_indirection_stage_table": {
               "stage_number": 0,
               "stage_table_type": "ternary_indirection",
@@ -52586,9 +51310,9 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "act_14",
+                  "action_name": "act_13",
                   "action_handle": 536870915,
-                  "table_name": "tbl_act_32",
+                  "table_name": "cond-19",
                   "next_table": 0,
                   "next_table_full": 2,
                   "vliw_instruction": 0,
@@ -52633,7 +51357,7 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "act_14",
+          "name": "act_13",
           "handle": 536870915,
           "indirect_resources": [],
           "allowed_as_default_action": true,
@@ -52653,10 +51377,10 @@
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
+              "dst": { "type": "phv", "name": "B26" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B28" }
+                { "type": "phv", "name": "B26" }
               ]
             }
           ]
@@ -52673,95 +51397,6 @@
     {
       "direction": "egress",
       "handle": 16777219,
-      "name": "tbl_act_15",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_15",
-                "action_handle": 536870916,
-                "table_name": "cond-20",
-                "next_table": 0,
-                "next_table_full": 3,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_15",
-          "handle": 536870916,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.dscp" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B21" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870916,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777220,
       "name": "tbl_int_egress_int_hop_cnt_increment",
       "table_type": "match",
       "size": 1,
@@ -52772,7 +51407,7 @@
             "stage_number": 0,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 4,
+            "logical_table_id": 3,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -52788,12 +51423,12 @@
             "action_format": [
               {
                 "action_name": "int_egress.int_hop_cnt_increment",
-                "action_handle": 536870917,
+                "action_handle": 536870916,
                 "table_name": "tbl_int_egress_int_hop_cnt_exceeded_0",
                 "next_table": 0,
-                "next_table_full": 7,
+                "next_table_full": 6,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
+                "vliw_instruction_full": 65,
                 "immediate_fields": []
               }
             ],
@@ -52806,7 +51441,7 @@
       "actions": [
         {
           "name": "int_egress.int_hop_cnt_increment",
-          "handle": 536870917,
+          "handle": 536870916,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -52835,6 +51470,109 @@
           ]
         }
       ],
+      "default_action_handle": 536870916,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": [],
+      "performs_hash_action": false,
+      "action_data_table_refs": [],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": []
+    },
+    {
+      "direction": "egress",
+      "handle": 16777220,
+      "name": "tbl_int_egress_int_transit",
+      "table_type": "match",
+      "size": 1,
+      "preferred_match_type": "exact",
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 0,
+            "size": 1,
+            "stage_table_type": "match_with_no_key",
+            "logical_table_id": 4,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "memory_resource_allocation": null,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 0,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0
+              }
+            ],
+            "result_physical_buses": [ 2 ],
+            "action_format": [
+              {
+                "action_name": "int_egress.int_transit",
+                "action_handle": 536870917,
+                "table_name": "tbl_int_egress_int_metadata_insert_int_set_header_0407_i12_0",
+                "next_table": 0,
+                "next_table_full": 5,
+                "vliw_instruction": 1,
+                "vliw_instruction_full": 66,
+                "immediate_fields": []
+              }
+            ],
+            "hash_functions": []
+          }
+        ],
+        "match_type": "match_with_no_key",
+        "uses_dynamic_key_masks": false
+      },
+      "actions": [
+        {
+          "name": "int_egress.int_transit",
+          "handle": 536870917,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
+              "src": [ { "immediate": "200" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operator": "shl",
+              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
+              "src": [
+                { "type": "phv", "name": "H20" },
+                { "type": "phv", "name": "H20" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B17" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "B16" }
+              ]
+            }
+          ]
+        }
+      ],
       "default_action_handle": 536870917,
       "action_profile": "",
       "default_next_table_mask": 0,
@@ -52852,7 +51590,7 @@
     {
       "direction": "egress",
       "handle": 16777221,
-      "name": "int_egress.int_prep",
+      "name": "tbl_int_egress_int_metadata_insert_int_set_header_0407_i12",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -52862,7 +51600,7 @@
             "size": 512,
             "stage_table_type": "ternary_match",
             "logical_table_id": 5,
-            "default_next_table": 6,
+            "default_next_table": 1,
             "has_attached_gateway": false,
             "pack_format": [
               {
@@ -52911,7 +51649,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "ternary_indirection_stage_table": {
               "stage_number": 0,
               "stage_table_type": "ternary_indirection",
@@ -52920,41 +51658,181 @@
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 8,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 123,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 107,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 91,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 64,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 75,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 59,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 43,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
                       "entry_number": 1,
                       "fields": [
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 11,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 65,
+                          "lsb_mem_word_offset": 16,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 31,
+                          "field_width": 5,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "--padding_33_63--"
+                          "lsb_mem_word_offset": 27,
+                          "field_name": "--padding_11_15--"
                         }
                       ]
                     },
@@ -52964,32 +51842,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 11,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 1,
+                          "lsb_mem_word_offset": 0,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 31,
+                          "field_width": 5,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "--padding_33_63--"
+                          "lsb_mem_word_offset": 11,
+                          "field_name": "--padding_11_15--"
                         }
                       ]
                     }
@@ -52999,30 +51867,37 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "NoAction",
-                  "action_handle": 536870919,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
-                  "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 68,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "int_egress.int_transit",
+                  "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
                   "action_handle": 536870918,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
+                  "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
                   "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 1,
+                  "next_table_full": 17,
+                  "vliw_instruction": 0,
                   "vliw_instruction_full": 67,
                   "immediate_fields": [
                     {
-                      "param_name": "switch_id",
-                      "param_type": "parameter",
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
                       "param_shift": 0,
                       "dest_start": 0,
-                      "dest_width": 32
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 2,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_5",
+                      "param_type": "constant",
+                      "const_value": 5,
+                      "param_shift": 0,
+                      "dest_start": 8,
+                      "dest_width": 3
                     }
                   ]
                 }
@@ -53039,8 +51914,8 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "NoAction",
-          "handle": 536870919,
+          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
+          "handle": 536870918,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -53056,60 +51931,33 @@
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
           "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_transit",
-          "handle": 536870918,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "switch_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
-              "src": [ { "type": "immediate", "name": "switch_id" } ]
+              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
+              "src": [ { "type": "phv", "name": "W19" } ]
             },
             {
               "name": "DirectAluPrimitive",
-              "operator": "shl",
-              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
+              "operation": "bitmasked-set",
+              "dst": { "type": "phv", "name": "B27" },
               "src": [
-                { "type": "phv", "name": "H18" },
-                { "type": "phv", "name": "H18" }
+                { "type": "immediate", "name": "$data0" },
+                { "type": "phv", "name": "B27" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B17" },
+              "dst": { "type": "phv", "name": "W18" },
               "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "B16" }
+                { "type": "phv", "name": "W16" },
+                { "type": "phv", "name": "W17" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870919,
+      "default_action_handle": 536870918,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -53120,4117 +51968,6 @@
     {
       "direction": "egress",
       "handle": 16777222,
-      "name": "int_egress.int_metadata_insert.int_inst_0407",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554433,
-          "name": "int_egress_int_metadata_insert_int_inst_0$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870920,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0407",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0407"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 6,
-            "default_next_table": 17,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-                "action_handle": 536870920,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-                "action_handle": 536870921,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-                "action_handle": 536870922,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-                "action_handle": 536870923,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_65",
-                    "param_type": "constant",
-                    "const_value": 65,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-                "action_handle": 536870924,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-                "action_handle": 536870925,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-                "action_handle": 536870926,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_66",
-                    "param_type": "constant",
-                    "const_value": 66,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-                "action_handle": 536870927,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_67",
-                    "param_type": "constant",
-                    "const_value": 67,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-                "action_handle": 536870928,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-                "action_handle": 536870929,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-                "action_handle": 536870930,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_80",
-                    "param_type": "constant",
-                    "const_value": 80,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-                "action_handle": 536870931,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_81",
-                    "param_type": "constant",
-                    "const_value": 81,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-                "action_handle": 536870932,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-                "action_handle": 536870933,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-                "action_handle": 536870934,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_82",
-                    "param_type": "constant",
-                    "const_value": 82,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-                "action_handle": 536870935,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 32,
-                "vliw_instruction_full": 96,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_83",
-                    "param_type": "constant",
-                    "const_value": 83,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 0,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 15,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 91,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 21,
-                            "field_name": "--padding_21_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 33554433,
-      "name": "int_egress_int_metadata_insert_int_inst_0$action",
-      "table_type": "action",
-      "size": 4096,
-      "stage_tables": [
-        {
-          "stage_number": 0,
-          "size": 4096,
-          "stage_table_type": "action_data",
-          "logical_table_id": 6,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870920
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870921
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870922
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870923
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870924
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870925
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870926
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870927
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870928
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870929
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870930
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870931
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870932
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870933
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870934
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870935
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777223,
       "name": "tbl_int_egress_int_hop_cnt_exceeded",
       "table_type": "match",
       "size": 1,
@@ -57241,7 +51978,7 @@
             "stage_number": 0,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 7,
+            "logical_table_id": 6,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57257,12 +51994,12 @@
             "action_format": [
               {
                 "action_name": "int_egress.int_hop_cnt_exceeded",
-                "action_handle": 536870936,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
+                "action_handle": 536870919,
+                "table_name": "tbl_act_27",
                 "next_table": 0,
                 "next_table_full": 21,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 71,
+                "vliw_instruction_full": 68,
                 "immediate_fields": []
               }
             ],
@@ -57275,7 +52012,7 @@
       "actions": [
         {
           "name": "int_egress.int_hop_cnt_exceeded",
-          "handle": 536870936,
+          "handle": 536870919,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57297,13 +52034,13 @@
               "dst": { "type": "phv", "name": "int_header.e" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H18" }
+                { "type": "phv", "name": "H20" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870936,
+      "default_action_handle": 536870919,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57319,7 +52056,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777224,
+      "handle": 16777223,
       "name": "tbl_act_0",
       "table_type": "match",
       "size": 1,
@@ -57346,8 +52083,8 @@
             "action_format": [
               {
                 "action_name": "act",
-                "action_handle": 536870937,
-                "table_name": "tbl_act_18",
+                "action_handle": 536870920,
+                "table_name": "tbl_act_16",
                 "next_table": 0,
                 "next_table_full": 32,
                 "vliw_instruction": 1,
@@ -57364,7 +52101,7 @@
       "actions": [
         {
           "name": "act",
-          "handle": 536870937,
+          "handle": 536870920,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57394,13 +52131,103 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870937,
+      "default_action_handle": 536870920,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": [],
+      "performs_hash_action": false,
+      "action_data_table_refs": [],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": []
+    },
+    {
+      "direction": "egress",
+      "handle": 16777224,
+      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
+      "table_type": "match",
+      "size": 1,
+      "preferred_match_type": "exact",
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 1,
+            "size": 1,
+            "stage_table_type": "match_with_no_key",
+            "logical_table_id": 1,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "memory_resource_allocation": null,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 0,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0
+              }
+            ],
+            "result_physical_buses": [ 2 ],
+            "action_format": [
+              {
+                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
+                "action_handle": 536870921,
+                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
+                "next_table": 0,
+                "next_table_full": 18,
+                "vliw_instruction": 1,
+                "vliw_instruction_full": 64,
+                "immediate_fields": []
+              }
+            ],
+            "hash_functions": []
+          }
+        ],
+        "match_type": "match_with_no_key",
+        "uses_dynamic_key_masks": false
+      },
+      "actions": [
+        {
+          "name": "int_egress.int_outer_encap.int_update_ipv4",
+          "handle": 536870921,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "ipv4.total_len" },
+              "src": [
+                { "type": "phv", "name": "H21" },
+                { "type": "phv", "name": "H19" }
+              ]
+            }
+          ]
+        }
+      ],
+      "default_action_handle": 536870921,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57427,7 +52254,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
+            "logical_table_id": 2,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57439,16 +52266,16 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
                 "action_name": "int_egress.int_outer_encap.int_update_shim",
-                "action_handle": 536870938,
+                "action_handle": 536870922,
                 "table_name": "tbl_int_egress_int_outer_encap_int_update_udp_0",
                 "next_table": 0,
-                "next_table_full": 18,
+                "next_table_full": 19,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
+                "vliw_instruction_full": 65,
                 "immediate_fields": []
               }
             ],
@@ -57461,7 +52288,7 @@
       "actions": [
         {
           "name": "int_egress.int_outer_encap.int_update_shim",
-          "handle": 536870938,
+          "handle": 536870922,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57490,7 +52317,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870938,
+      "default_action_handle": 536870922,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57517,7 +52344,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
+            "logical_table_id": 3,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57529,16 +52356,16 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 1 ],
+            "result_physical_buses": [ 0 ],
             "action_format": [
               {
                 "action_name": "int_egress.int_outer_encap.int_update_udp",
-                "action_handle": 536870939,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
+                "action_handle": 536870923,
+                "table_name": "tbl_int_egress_int_metadata_insert_int_set_header_0003_i13_0",
                 "next_table": 0,
-                "next_table_full": 19,
+                "next_table_full": 20,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
+                "vliw_instruction_full": 66,
                 "immediate_fields": []
               }
             ],
@@ -57551,7 +52378,7 @@
       "actions": [
         {
           "name": "int_egress.int_outer_encap.int_update_udp",
-          "handle": 536870939,
+          "handle": 536870923,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57573,8 +52400,8 @@
               "operation": "add",
               "dst": { "type": "phv", "name": "udp.len" },
               "src": [
-                { "type": "phv", "name": "H16" },
-                { "type": "phv", "name": "H17" }
+                { "type": "phv", "name": "H18" },
+                { "type": "phv", "name": "H19" }
               ]
             },
             {
@@ -57585,7 +52412,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870939,
+      "default_action_handle": 536870923,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57602,1530 +52429,7 @@
     {
       "direction": "egress",
       "handle": 16777227,
-      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 3,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
-                "action_handle": 536870940,
-                "table_name": "int_egress_int_metadata_insert_int_inst",
-                "next_table": 0,
-                "next_table_full": 20,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_outer_encap.int_update_ipv4",
-          "handle": 536870940,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [
-                { "type": "phv", "name": "H19" },
-                { "type": "phv", "name": "H17" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870940,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777228,
-      "name": "int_egress.int_metadata_insert.int_inst_0003",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870941,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0003",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0003"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 21,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-                "action_handle": 536870941,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 3,
-                "vliw_instruction_full": 67,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-                "action_handle": 536870942,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-                "action_handle": 536870949,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-                "action_handle": 536870943,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-                "action_handle": 536870944,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-                "action_handle": 536870945,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-                "action_handle": 536870946,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-                "action_handle": 536870947,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-                "action_handle": 536870948,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-                "action_handle": 536870950,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-                "action_handle": 536870951,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-                "action_handle": 536870952,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-                "action_handle": 536870953,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-                "action_handle": 536870954,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-                "action_handle": 536870955,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-                "action_handle": 536870956,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 1,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 16,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 90,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 22,
-                            "field_name": "--padding_22_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-          "handle": 536870941,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-          "handle": 536870942,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-          "handle": 536870949,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-          "handle": 536870943,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-          "handle": 536870944,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-          "handle": 536870945,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-          "handle": 536870946,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-          "handle": 536870947,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-          "handle": 536870948,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-          "handle": 536870950,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-          "handle": 536870951,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-          "handle": 536870952,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-          "handle": 536870953,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-          "handle": 536870954,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-          "handle": 536870955,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-          "handle": 536870956,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 16777229,
-      "name": "tbl_spgw_egress_gtpu_encap",
+      "name": "tbl_int_egress_int_metadata_insert_int_set_header_0003_i13",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -59134,9 +52438,9 @@
             "stage_number": 1,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 5,
-            "default_next_table": 6,
-            "has_attached_gateway": true,
+            "logical_table_id": 4,
+            "default_next_table": 5,
+            "has_attached_gateway": false,
             "pack_format": [
               {
                 "table_word_width": 0,
@@ -59202,32 +52506,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 121,
+                          "lsb_mem_word_offset": 120,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 127,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59237,32 +52531,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 113,
+                          "lsb_mem_word_offset": 112,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 119,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59272,32 +52556,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 105,
+                          "lsb_mem_word_offset": 104,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 111,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59307,32 +52581,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 97,
+                          "lsb_mem_word_offset": 96,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 103,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59342,32 +52606,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 89,
+                          "lsb_mem_word_offset": 88,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 95,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59377,32 +52631,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 81,
+                          "lsb_mem_word_offset": 80,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 87,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59412,32 +52656,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 73,
+                          "lsb_mem_word_offset": 72,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 79,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59447,32 +52681,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 65,
+                          "lsb_mem_word_offset": 64,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 71,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59482,32 +52706,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 57,
+                          "lsb_mem_word_offset": 56,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 63,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59517,32 +52731,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 49,
+                          "lsb_mem_word_offset": 48,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 55,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59552,32 +52756,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 41,
+                          "lsb_mem_word_offset": 40,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 47,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59587,32 +52781,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 33,
+                          "lsb_mem_word_offset": 32,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 39,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59622,32 +52806,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 25,
+                          "lsb_mem_word_offset": 24,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 31,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59657,32 +52831,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 17,
+                          "lsb_mem_word_offset": 16,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 23,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59692,32 +52856,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 9,
+                          "lsb_mem_word_offset": 8,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 15,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59727,32 +52881,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 1,
+                          "lsb_mem_word_offset": 0,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 7,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     }
@@ -59762,13 +52906,13 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "spgw_egress.gtpu_encap",
-                  "action_handle": 536870957,
-                  "table_name": "tbl_act_30",
+                  "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
+                  "action_handle": 536870924,
+                  "table_name": "tbl_act_27",
                   "next_table": 0,
-                  "next_table_full": 22,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 71,
+                  "next_table_full": 21,
+                  "vliw_instruction": 0,
+                  "vliw_instruction_full": 67,
                   "immediate_fields": [
                     {
                       "param_name": "constant_1",
@@ -59783,7 +52927,7 @@
                       "param_type": "constant",
                       "const_value": 1,
                       "param_shift": 0,
-                      "dest_start": 5,
+                      "dest_start": 3,
                       "dest_width": 1
                     },
                     {
@@ -59791,7 +52935,7 @@
                       "param_type": "constant",
                       "const_value": 1,
                       "param_shift": 0,
-                      "dest_start": 3,
+                      "dest_start": 5,
                       "dest_width": 1
                     }
                   ]
@@ -59802,21 +52946,15 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554434,
-          "name": "tbl_spgw_egress_gtpu_encap_0$action"
-        }
-      ],
+      "action_data_table_refs": [],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
+          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
+          "handle": 536870924,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -59831,87 +52969,59 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
           "primitives": [
             {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
               "src": [ { "type": "immediate", "name": "0" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
+              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
+              "src": [ { "type": "phv", "name": "W28" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
+              "src": [ { "type": "phv", "name": "B21" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
               "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
+                { "type": "phv", "name": "H33" },
+                { "type": "phv", "name": "H34" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
+              "dst": { "type": "phv", "name": "B27" },
+              "src": [
+                { "type": "immediate", "name": "$data0" },
+                { "type": "phv", "name": "B27" }
+              ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
+              "dst": { "type": "phv", "name": "H24" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "H23" }
+              ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
+              "dst": { "type": "phv", "name": "H25" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "H26" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870957,
+      "default_action_handle": 536870924,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -59921,334 +53031,8 @@
     },
     {
       "direction": "egress",
-      "handle": 33554434,
-      "name": "tbl_spgw_egress_gtpu_encap_0$action",
-      "table_type": "action",
-      "size": 1024,
-      "stage_tables": [
-        {
-          "stage_number": 1,
-          "size": 1024,
-          "stage_table_type": "action_data",
-          "logical_table_id": 5,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$constant10"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant11"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 45,
-                      "field_name": "$constant5"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 44,
-                      "field_name": "$constant6"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 43,
-                      "field_name": "$constant7"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 42,
-                      "field_name": "$constant8"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "$constant9"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 60,
-                      "field_name": "$constant12"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant13"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 6,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
-                      "lsb_mem_word_offset": 50,
-                      "field_name": "$constant14"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "$constant15"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 93,
-                      "field_name": "$constant16"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 13,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "$constant17"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$constant18"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant19"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "$constant20"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant21"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870957
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
-              "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777230,
-      "name": "tbl_act_13",
+      "handle": 16777228,
+      "name": "tbl_act_12",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -60258,7 +53042,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
+            "logical_table_id": 5,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -60273,13 +53057,13 @@
             "result_physical_buses": [ 4 ],
             "action_format": [
               {
-                "action_name": "act_13",
-                "action_handle": 536870958,
-                "table_name": "--END_OF_PIPELINE--",
+                "action_name": "act_12",
+                "action_handle": 536870925,
+                "table_name": "tbl_spgw_egress_gtpu_encap_0",
                 "next_table": 0,
-                "next_table_full": 255,
+                "next_table_full": 35,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 73,
+                "vliw_instruction_full": 68,
                 "immediate_fields": []
               }
             ],
@@ -60291,8 +53075,8 @@
       },
       "actions": [
         {
-          "name": "act_13",
-          "handle": 536870958,
+          "name": "act_12",
+          "handle": 536870925,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60314,21 +53098,21 @@
               "dst": { "type": "phv", "name": "packet_in.$valid" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B30" }
+                { "type": "phv", "name": "B26" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "packet_in.ingress_port" },
               "src": [
-                { "type": "phv", "name": "H27" },
-                { "type": "phv", "name": "H28" }
+                { "type": "phv", "name": "H26" },
+                { "type": "phv", "name": "H27" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870958,
+      "default_action_handle": 536870925,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60344,7 +53128,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777231,
+      "handle": 16777229,
       "name": "tbl_act_1",
       "table_type": "match",
       "size": 512,
@@ -60563,8 +53347,8 @@
               "action_format": [
                 {
                   "action_name": "act_4",
-                  "action_handle": 536870959,
-                  "table_name": "tbl_act_19",
+                  "action_handle": 536870926,
+                  "table_name": "tbl_act_17",
                   "next_table": 0,
                   "next_table_full": 33,
                   "vliw_instruction": 1,
@@ -60610,7 +53394,7 @@
       "actions": [
         {
           "name": "act_4",
-          "handle": 536870959,
+          "handle": 536870926,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60630,16 +53414,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870959,
+      "default_action_handle": 536870926,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60649,7 +53433,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777232,
+      "handle": 16777230,
       "name": "tbl_act_2",
       "table_type": "match",
       "size": 1,
@@ -60676,7 +53460,7 @@
             "action_format": [
               {
                 "action_name": "act_2",
-                "action_handle": 536870960,
+                "action_handle": 536870927,
                 "table_name": "spgw_ingress_ue_filter_table",
                 "next_table": 0,
                 "next_table_full": 34,
@@ -60694,7 +53478,7 @@
       "actions": [
         {
           "name": "act_2",
-          "handle": 536870960,
+          "handle": 536870927,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60724,12 +53508,12 @@
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [ { "type": "phv", "name": "H3" } ]
+              "src": [ { "type": "phv", "name": "H8" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ipv4.identification" },
-              "src": [ { "type": "phv", "name": "H9" } ]
+              "src": [ { "type": "phv", "name": "H6" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
@@ -60769,28 +53553,28 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H6" },
-              "src": [ { "type": "phv", "name": "H5" } ]
+              "dst": { "type": "phv", "name": "H3" },
+              "src": [ { "type": "phv", "name": "H2" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H8" },
-              "src": [ { "type": "phv", "name": "H7" } ]
+              "dst": { "type": "phv", "name": "H5" },
+              "src": [ { "type": "phv", "name": "H4" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W9" },
-              "src": [ { "type": "phv", "name": "W8" } ]
+              "dst": { "type": "phv", "name": "W12" },
+              "src": [ { "type": "phv", "name": "W11" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W11" },
-              "src": [ { "type": "phv", "name": "W10" } ]
+              "dst": { "type": "phv", "name": "W14" },
+              "src": [ { "type": "phv", "name": "W13" } ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870960,
+      "default_action_handle": 536870927,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60806,7 +53590,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777233,
+      "handle": 16777231,
       "name": "spgw_ingress.ue_filter_table",
       "table_type": "match",
       "size": 512,
@@ -61707,8 +54491,8 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870961,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870928,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -61729,7 +54513,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870961,
+          "handle": 536870928,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -61748,7 +54532,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870961,
+      "default_action_handle": 536870928,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -61769,8 +54553,1131 @@
       ]
     },
     {
+      "direction": "egress",
+      "handle": 16777232,
+      "name": "tbl_spgw_egress_gtpu_encap",
+      "table_type": "match",
+      "size": 512,
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 2,
+            "size": 512,
+            "stage_table_type": "ternary_match",
+            "logical_table_id": 3,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 47,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0,
+                "entries": [
+                  {
+                    "entry_number": 0,
+                    "fields": [
+                      {
+                        "field_name": "--tcam_payload_0--",
+                        "lsb_mem_word_offset": 0,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "payload",
+                        "start_bit": 0,
+                        "field_width": 1
+                      },
+                      {
+                        "field_name": "--tcam_parity_0--",
+                        "lsb_mem_word_offset": 45,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "parity",
+                        "start_bit": 0,
+                        "field_width": 2
+                      },
+                      {
+                        "field_name": "--unused--",
+                        "lsb_mem_word_offset": 1,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "zero",
+                        "start_bit": 0,
+                        "field_width": 41
+                      }
+                    ]
+                  }
+                ]
+              }
+            ],
+            "memory_resource_allocation": {
+              "memory_type": "tcam",
+              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
+              "spare_bank_memory_unit": 0
+            },
+            "result_physical_buses": [ 3 ],
+            "ternary_indirection_stage_table": {
+              "stage_number": 2,
+              "stage_table_type": "ternary_indirection",
+              "size": 512,
+              "pack_format": [
+                {
+                  "memory_word_width": 128,
+                  "table_word_width": 128,
+                  "entries_per_table_word": 16,
+                  "number_memory_units_per_table_word": 1,
+                  "entries": [
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 121,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 127,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 113,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 119,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 105,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 111,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 97,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 103,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 89,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 95,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 81,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 87,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 73,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 79,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 64,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 65,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 71,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 57,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 63,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 49,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 55,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 41,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 47,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 33,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 39,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 25,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 31,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 17,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 23,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 9,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 15,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 0,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 0,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 1,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 7,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
+              "action_format": [
+                {
+                  "action_name": "spgw_egress.gtpu_encap",
+                  "action_handle": 536870929,
+                  "table_name": "--END_OF_PIPELINE--",
+                  "next_table": 0,
+                  "next_table_full": 255,
+                  "vliw_instruction": 1,
+                  "vliw_instruction_full": 64,
+                  "immediate_fields": [
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 4,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 5,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 3,
+                      "dest_width": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        ],
+        "match_type": "ternary"
+      },
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554433,
+          "name": "tbl_spgw_egress_gtpu_encap_0$action"
+        }
+      ],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": [],
+      "actions": [
+        {
+          "name": "spgw_egress.gtpu_encap",
+          "handle": 536870929,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
+              "src": [
+                { "type": "action_param", "name": "$constant4" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
+              "src": [ { "immediate": "5395" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
+              "src": [ { "type": "phv", "name": "W25" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
+              "src": [ { "type": "phv", "name": "W23" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_udp.len" },
+              "src": [
+                { "type": "action_param", "name": "$constant3" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "src": [ { "type": "immediate", "name": "0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.msglen" },
+              "src": [ { "type": "phv", "name": "H21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.teid" },
+              "src": [ { "type": "phv", "name": "W21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B26" },
+              "src": [
+                { "type": "immediate", "name": "$data4" },
+                { "type": "phv", "name": "B26" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H29" },
+              "src": [ { "type": "action_param", "name": "$data0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H30" },
+              "src": [ { "type": "action_param", "name": "$data1" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W29" },
+              "src": [ { "type": "action_param", "name": "$data2" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W30" },
+              "src": [ { "type": "action_param", "name": "$data3" } ]
+            }
+          ]
+        }
+      ],
+      "default_action_handle": 536870929,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": []
+    },
+    {
+      "direction": "egress",
+      "handle": 33554433,
+      "name": "tbl_spgw_egress_gtpu_encap_0$action",
+      "table_type": "action",
+      "size": 1024,
+      "stage_tables": [
+        {
+          "stage_number": 2,
+          "size": 1024,
+          "stage_table_type": "action_data",
+          "logical_table_id": 3,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 1,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "$constant3"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "$constant4"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 40,
+                      "field_name": "$constant10"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "$constant11"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 3,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
+                      "lsb_mem_word_offset": 45,
+                      "field_name": "$constant5"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 44,
+                      "field_name": "$constant6"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 43,
+                      "field_name": "$constant7"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 42,
+                      "field_name": "$constant8"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 41,
+                      "field_name": "$constant9"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
+                      "lsb_mem_word_offset": 60,
+                      "field_name": "$constant12"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
+                      "lsb_mem_word_offset": 56,
+                      "field_name": "$constant13"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 6,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
+                      "lsb_mem_word_offset": 50,
+                      "field_name": "$constant14"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 2,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "$constant15"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 3,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
+                      "lsb_mem_word_offset": 93,
+                      "field_name": "$constant16"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 13,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "$constant17"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 72,
+                      "field_name": "$constant18"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "$constant19"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "$constant20"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "$constant21"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870929
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 90
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "spgw_egress.gtpu_encap",
+          "handle": 536870929,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
+              "src": [
+                { "type": "action_param", "name": "$constant4" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
+              "src": [ { "immediate": "5395" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
+              "src": [ { "type": "phv", "name": "W25" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
+              "src": [ { "type": "phv", "name": "W23" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_udp.len" },
+              "src": [
+                { "type": "action_param", "name": "$constant3" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "src": [ { "type": "immediate", "name": "0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.msglen" },
+              "src": [ { "type": "phv", "name": "H21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.teid" },
+              "src": [ { "type": "phv", "name": "W21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B26" },
+              "src": [
+                { "type": "immediate", "name": "$data4" },
+                { "type": "phv", "name": "B26" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H29" },
+              "src": [ { "type": "action_param", "name": "$data0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H30" },
+              "src": [ { "type": "action_param", "name": "$data1" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W29" },
+              "src": [ { "type": "action_param", "name": "$data2" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W30" },
+              "src": [ { "type": "action_param", "name": "$data3" } ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
       "direction": "ingress",
-      "handle": 16777234,
+      "handle": 16777233,
       "name": "spgw_ingress.s1u_filter_table",
       "table_type": "match",
       "size": 3072,
@@ -61779,7 +55686,7 @@
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
-      "default_action_handle": 536870962,
+      "default_action_handle": 536870930,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -64097,8 +58004,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870962,
-                "table_name": "tbl_act_22",
+                "action_handle": 536870930,
+                "table_name": "tbl_act_20",
                 "next_table": 0,
                 "next_table_full": 64,
                 "vliw_instruction": 0,
@@ -64492,7 +58399,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870962,
+          "handle": 536870930,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -64513,7 +58420,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777235,
+      "handle": 16777234,
       "name": "tbl_act_3",
       "table_type": "match",
       "size": 512,
@@ -64692,8 +58599,8 @@
               "action_format": [
                 {
                   "action_name": "act_1",
-                  "action_handle": 536870963,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870931,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -64739,7 +58646,7 @@
       "actions": [
         {
           "name": "act_1",
-          "handle": 536870963,
+          "handle": 536870931,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -64759,16 +58666,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870963,
+      "default_action_handle": 536870931,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -64778,7 +58685,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777236,
+      "handle": 16777235,
       "name": "tbl_act_4",
       "table_type": "match",
       "size": 512,
@@ -64957,8 +58864,8 @@
               "action_format": [
                 {
                   "action_name": "act_3",
-                  "action_handle": 536870964,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870932,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -65004,7 +58911,7 @@
       "actions": [
         {
           "name": "act_3",
-          "handle": 536870964,
+          "handle": 536870932,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -65024,16 +58931,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870964,
+      "default_action_handle": 536870932,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -65043,7 +58950,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777237,
+      "handle": 16777236,
       "name": "tbl_act_5",
       "table_type": "match",
       "size": 1,
@@ -65070,7 +58977,7 @@
             "action_format": [
               {
                 "action_name": "act_5",
-                "action_handle": 536870965,
+                "action_handle": 536870933,
                 "table_name": "cond-5",
                 "next_table": 0,
                 "next_table_full": 80,
@@ -65088,7 +58995,7 @@
       "actions": [
         {
           "name": "act_5",
-          "handle": 536870965,
+          "handle": 536870933,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -65110,13 +59017,13 @@
               "dst": { "type": "phv", "name": "spgw_ingress_hasReturned" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870965,
+      "default_action_handle": 536870933,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -65132,14 +59039,14 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777238,
+      "handle": 16777237,
       "name": "spgw_ingress.dl_sess_lookup",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554435,
+          "handle": 33554434,
           "name": "spgw_ingress_dl_sess_lookup$action"
         }
       ],
@@ -65147,7 +59054,7 @@
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
-      "default_action_handle": 536870967,
+      "default_action_handle": 536870935,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -67615,7 +61522,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870967,
+                "action_handle": 536870935,
                 "table_name": "tbl_spgw_ingress_drop_now_0",
                 "next_table": 0,
                 "next_table_full": 82,
@@ -67625,7 +61532,7 @@
               },
               {
                 "action_name": "spgw_ingress.set_dl_sess_info",
-                "action_handle": 536870966,
+                "action_handle": 536870934,
                 "table_name": "tbl_spgw_ingress_drop_now_0",
                 "next_table": 0,
                 "next_table_full": 82,
@@ -68028,7 +61935,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870967,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68047,7 +61954,7 @@
         },
         {
           "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68098,7 +62005,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554435,
+      "handle": 33554434,
       "name": "spgw_ingress_dl_sess_lookup$action",
       "table_type": "action",
       "size": 4096,
@@ -68145,7 +62052,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870967
+              "action_handle": 536870935
             },
             {
               "memory_word_width": 128,
@@ -68200,7 +62107,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870966
+              "action_handle": 536870934
             }
           ],
           "memory_resource_allocation": {
@@ -68216,7 +62123,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870967,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68235,7 +62142,7 @@
         },
         {
           "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68287,7 +62194,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777239,
+      "handle": 16777238,
       "name": "tbl_spgw_ingress_drop_now",
       "table_type": "match",
       "size": 1,
@@ -68314,7 +62221,7 @@
             "action_format": [
               {
                 "action_name": "spgw_ingress.drop_now",
-                "action_handle": 536870968,
+                "action_handle": 536870936,
                 "table_name": "spgw_ingress_ue_cdr_table",
                 "next_table": 0,
                 "next_table_full": 96,
@@ -68332,7 +62239,7 @@
       "actions": [
         {
           "name": "spgw_ingress.drop_now",
-          "handle": 536870968,
+          "handle": 536870936,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68362,13 +62269,13 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870968,
+      "default_action_handle": 536870936,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -68384,7 +62291,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777240,
+      "handle": 16777239,
       "name": "spgw_ingress.ue_cdr_table",
       "table_type": "match",
       "size": 3072,
@@ -68399,7 +62306,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870970,
+      "default_action_handle": 536870938,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -70723,8 +64630,8 @@
             "action_format": [
               {
                 "action_name": "spgw_ingress.update_ue_cdr",
-                "action_handle": 536870969,
-                "table_name": "tbl_act_23",
+                "action_handle": 536870937,
+                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
                 "next_table": 0,
                 "next_table_full": 97,
                 "vliw_instruction": 0,
@@ -70733,8 +64640,8 @@
               },
               {
                 "action_name": "NoAction",
-                "action_handle": 536870970,
-                "table_name": "tbl_act_23",
+                "action_handle": 536870938,
+                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
                 "next_table": 0,
                 "next_table_full": 97,
                 "vliw_instruction": 0,
@@ -71161,7 +65068,7 @@
       "actions": [
         {
           "name": "spgw_ingress.update_ue_cdr",
-          "handle": 536870969,
+          "handle": 536870937,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -71180,7 +65087,7 @@
         },
         {
           "name": "NoAction",
-          "handle": 536870970,
+          "handle": 536870938,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -71241,93 +65148,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777241,
-      "name": "tbl_act_6",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_6",
-                "action_handle": 536870971,
-                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
-                "next_table": 0,
-                "next_table_full": 98,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_6",
-          "handle": 536870971,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.ipv4_len" },
-              "src": [ { "type": "phv", "name": "H4" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870971,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777242,
+      "handle": 16777240,
       "name": "tbl_spgw_ingress_gtpu_decap",
       "table_type": "match",
       "size": 512,
@@ -71337,8 +65158,8 @@
             "stage_number": 6,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
-            "default_next_table": 3,
+            "logical_table_id": 1,
+            "default_next_table": 2,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -71387,7 +65208,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 3 ],
+            "result_physical_buses": [ 2 ],
             "ternary_indirection_stage_table": {
               "stage_number": 6,
               "stage_table_type": "ternary_indirection",
@@ -72206,12 +66027,12 @@
               "action_format": [
                 {
                   "action_name": "spgw_ingress.gtpu_decap",
-                  "action_handle": 536870972,
+                  "action_handle": 536870939,
                   "table_name": "filtering_ingress_port_vlan",
                   "next_table": 0,
-                  "next_table_full": 99,
+                  "next_table_full": 98,
                   "vliw_instruction": 1,
-                  "vliw_instruction_full": 66,
+                  "vliw_instruction_full": 65,
                   "immediate_fields": [
                     {
                       "param_name": "constant_0",
@@ -72245,7 +66066,7 @@
       "actions": [
         {
           "name": "spgw_ingress.gtpu_decap",
-          "handle": 536870972,
+          "handle": 536870939,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -72281,7 +66102,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870972,
+      "default_action_handle": 536870939,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -72291,7 +66112,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777243,
+      "handle": 16777241,
       "name": "filtering.ingress_port_vlan",
       "table_type": "match",
       "size": 512,
@@ -72301,8 +66122,8 @@
             "stage_number": 6,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 3,
-            "default_next_table": 4,
+            "logical_table_id": 2,
+            "default_next_table": 3,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -73228,42 +67049,42 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870975,
+                  "action_handle": 536870942,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 0,
                   "vliw_instruction_full": 64,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.push_internal_vlan",
-                  "action_handle": 536870973,
+                  "action_handle": 536870940,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 1,
-                  "vliw_instruction_full": 67,
+                  "vliw_instruction_full": 66,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.set_vlan",
-                  "action_handle": 536870974,
+                  "action_handle": 536870941,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 2,
                   "vliw_instruction_full": 68,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.drop",
-                  "action_handle": 536870976,
+                  "action_handle": 536870943,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 3,
-                  "vliw_instruction_full": 69,
+                  "vliw_instruction_full": 67,
                   "immediate_fields": []
                 }
               ]
@@ -73275,7 +67096,7 @@
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554436,
+          "handle": 33554435,
           "name": "filtering_ingress_port_vlan$action"
         }
       ],
@@ -73292,7 +67113,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870975,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -73311,7 +67132,7 @@
         },
         {
           "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73347,7 +67168,7 @@
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -73355,22 +67176,22 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
+              "dst": { "type": "phv", "name": "W10" },
               "src": [
                 { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             }
           ]
         },
         {
           "name": "filtering.set_vlan",
-          "handle": 536870974,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73398,14 +67219,14 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             }
           ]
         },
         {
           "name": "filtering.drop",
-          "handle": 536870976,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73432,7 +67253,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870975,
+      "default_action_handle": 536870942,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -73485,7 +67306,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 3,
+          "logical_table_id": 2,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -73515,7 +67336,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554436,
+      "handle": 33554435,
       "name": "filtering_ingress_port_vlan$action",
       "table_type": "action",
       "size": 2048,
@@ -73524,7 +67345,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "action_data",
-          "logical_table_id": 3,
+          "logical_table_id": 2,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -73562,7 +67383,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870975
+              "action_handle": 536870942
             },
             {
               "memory_word_width": 128,
@@ -73677,7 +67498,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870973
+              "action_handle": 536870940
             },
             {
               "memory_word_width": 128,
@@ -73750,7 +67571,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870974
+              "action_handle": 536870941
             },
             {
               "memory_word_width": 128,
@@ -73787,7 +67608,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870976
+              "action_handle": 536870943
             }
           ],
           "memory_resource_allocation": {
@@ -73800,7 +67621,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870975,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -73819,7 +67640,7 @@
         },
         {
           "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73855,7 +67676,7 @@
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -73863,22 +67684,22 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
+              "dst": { "type": "phv", "name": "W10" },
               "src": [
                 { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             }
           ]
         },
         {
           "name": "filtering.set_vlan",
-          "handle": 536870974,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73906,14 +67727,14 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             }
           ]
         },
         {
           "name": "filtering.drop",
-          "handle": 536870976,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73944,7 +67765,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777244,
+      "handle": 16777242,
       "name": "filtering.fwd_classifier",
       "table_type": "match",
       "size": 3072,
@@ -73959,7 +67780,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870977,
+      "default_action_handle": 536870944,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -74006,8 +67827,8 @@
             "stage_number": 6,
             "size": 3072,
             "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 101,
+            "logical_table_id": 3,
+            "default_next_table": 100,
             "has_attached_gateway": false,
             "hash_functions": [
               {
@@ -79779,12 +73600,12 @@
             "action_format": [
               {
                 "action_name": "filtering.set_forwarding_type",
-                "action_handle": 536870977,
-                "table_name": "tbl_act_29",
+                "action_handle": 536870944,
+                "table_name": "tbl_act_26",
                 "next_table": 0,
-                "next_table_full": 101,
+                "next_table_full": 100,
                 "vliw_instruction": 0,
-                "vliw_instruction_full": 70,
+                "vliw_instruction_full": 69,
                 "immediate_fields": [
                   {
                     "param_name": "fwd_type",
@@ -80395,7 +74216,7 @@
       "actions": [
         {
           "name": "filtering.set_forwarding_type",
-          "handle": 536870977,
+          "handle": 536870944,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80424,7 +74245,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.fwd_type" },
               "src": [
                 { "type": "immediate", "name": "fwd_type" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
@@ -80442,7 +74263,7 @@
           "stage_number": 6,
           "size": 4096,
           "stage_table_type": "statistics",
-          "logical_table_id": 4,
+          "logical_table_id": 3,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -80473,8 +74294,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777245,
-      "name": "tbl_act_12",
+      "handle": 16777243,
+      "name": "tbl_act_11",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -80484,7 +74305,7 @@
             "stage_number": 6,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 5,
+            "logical_table_id": 4,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -80499,11 +74320,11 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_12",
-                "action_handle": 536870978,
-                "table_name": "tbl_act_27",
+                "action_name": "act_11",
+                "action_handle": 536870945,
+                "table_name": "tbl_act_24",
                 "next_table": 0,
-                "next_table_full": 102,
+                "next_table_full": 101,
                 "vliw_instruction": 0,
                 "vliw_instruction_full": 64,
                 "immediate_fields": []
@@ -80517,8 +74338,8 @@
       },
       "actions": [
         {
-          "name": "act_12",
-          "handle": 536870978,
+          "name": "act_11",
+          "handle": 536870945,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80537,7 +74358,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870978,
+      "default_action_handle": 536870945,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -80553,8 +74374,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777246,
-      "name": "tbl_act_10",
+      "handle": 16777244,
+      "name": "tbl_act_9",
       "table_type": "match",
       "size": 512,
       "preferred_match_type": "exact",
@@ -80564,7 +74385,7 @@
             "stage_number": 6,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
+            "logical_table_id": 5,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -80576,11 +74397,11 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
-                "action_name": "act_10",
-                "action_handle": 536870979,
+                "action_name": "act_9",
+                "action_handle": 536870946,
                 "table_name": "forwarding_bridging",
                 "next_table": 0,
                 "next_table_full": 112,
@@ -80597,8 +74418,8 @@
       },
       "actions": [
         {
-          "name": "act_10",
-          "handle": 536870979,
+          "name": "act_9",
+          "handle": 536870946,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80617,7 +74438,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870979,
+      "default_action_handle": 536870946,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -80648,7 +74469,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 6,
+          "logical_table_id": 5,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -80678,7 +74499,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777247,
+      "handle": 16777245,
       "name": "forwarding.bridging",
       "table_type": "match",
       "size": 512,
@@ -80805,16 +74626,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 7,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -80829,22 +75025,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -80864,22 +75425,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -80894,7 +75445,7 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870981,
+                  "action_handle": 536870948,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -80904,21 +75455,13 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870980,
+                  "action_handle": 536870947,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 }
               ]
             }
@@ -80926,7 +75469,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554436,
+          "name": "forwarding_bridging$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -80940,7 +75489,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870981,
+          "handle": 536870948,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80955,12 +75504,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870980,
+          "handle": 536870947,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80982,17 +75530,24 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870981,
+      "default_action_handle": 536870948,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -81064,11 +75619,230 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777248,
+      "handle": 33554436,
+      "name": "forwarding_bridging$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 0,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870948
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870947
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 81 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 81
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870948,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870947,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777246,
       "name": "forwarding.mpls",
       "table_type": "match",
       "size": 3072,
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554437,
+          "name": "forwarding_mpls$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -81079,7 +75853,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870983,
+      "default_action_handle": 536870950,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -82479,8 +77253,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870983,
-                "table_name": "tbl_act_24",
+                "action_handle": 536870950,
+                "table_name": "tbl_act_21",
                 "next_table": 0,
                 "next_table_full": 114,
                 "vliw_instruction": 0,
@@ -82489,8 +77263,8 @@
               },
               {
                 "action_name": "forwarding.pop_mpls_and_next",
-                "action_handle": 536870982,
-                "table_name": "tbl_act_24",
+                "action_handle": 536870949,
+                "table_name": "tbl_act_21",
                 "next_table": 0,
                 "next_table_full": 114,
                 "vliw_instruction": 1,
@@ -82500,8 +77274,8 @@
                     "param_name": "next_id",
                     "param_type": "parameter",
                     "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 32
+                    "dest_start": 16,
+                    "dest_width": 16
                   }
                 ]
               }
@@ -82889,10 +77663,11 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870983,
+          "handle": 536870950,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
           "p4_parameters": [],
           "override_meter_addr": false,
           "override_meter_addr_pfe": false,
@@ -82903,15 +77678,15 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.pop_mpls_and_next",
-          "handle": 536870982,
+          "handle": 536870949,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
           "p4_parameters": [
             {
               "name": "next_id",
@@ -82929,7 +77704,6 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
@@ -82941,8 +77715,16 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "immediate", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
@@ -82990,8 +77772,343 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777249,
-      "name": "tbl_act_7",
+      "handle": 33554437,
+      "name": "forwarding_mpls$action",
+      "table_type": "action",
+      "size": 8192,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 8192,
+          "stage_table_type": "action_data",
+          "logical_table_id": 1,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 8,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 7,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 6,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 5,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 4,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 3,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 2,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870950
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 8,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 7,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 6,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 5,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 4,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 3,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 2,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "next_id"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870949
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 88
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870950,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.pop_mpls_and_next",
+          "handle": 536870949,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "mpls.$valid" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "B8" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "immediate", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777247,
+      "name": "tbl_act_6",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -83188,8 +78305,8 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "act_7",
-                  "action_handle": 536870984,
+                  "action_name": "act_6",
+                  "action_handle": 536870951,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -83215,8 +78332,8 @@
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554437,
-          "name": "tbl_act_24$action"
+          "handle": 33554438,
+          "name": "tbl_act_21$action"
         }
       ],
       "selection_table_refs": [],
@@ -83225,8 +78342,8 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "act_7",
-          "handle": 536870984,
+          "name": "act_6",
+          "handle": 536870951,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83247,7 +78364,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -83255,13 +78372,13 @@
               "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
+                { "type": "phv", "name": "W35" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870984,
+      "default_action_handle": 536870951,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -83271,8 +78388,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554437,
-      "name": "tbl_act_24$action",
+      "handle": 33554438,
+      "name": "tbl_act_21$action",
       "table_type": "action",
       "size": 4096,
       "stage_tables": [
@@ -83386,7 +78503,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870984
+              "action_handle": 536870951
             }
           ],
           "memory_resource_allocation": {
@@ -83398,8 +78515,8 @@
       ],
       "actions": [
         {
-          "name": "act_7",
-          "handle": 536870984,
+          "name": "act_6",
+          "handle": 536870951,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83420,7 +78537,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -83428,7 +78545,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
+                { "type": "phv", "name": "W35" }
               ]
             }
           ]
@@ -83438,7 +78555,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777250,
+      "handle": 16777248,
       "name": "forwarding.unicast_v4",
       "table_type": "match",
       "size": 512,
@@ -83583,16 +78700,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 7,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -83607,22 +79099,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -83642,22 +79499,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -83672,7 +79519,7 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870986,
+                  "action_handle": 536870953,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -83682,21 +79529,13 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870985,
+                  "action_handle": 536870952,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 68,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 }
               ]
             }
@@ -83704,7 +79543,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554439,
+          "name": "forwarding_unicast_v4$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -83718,7 +79563,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870986,
+          "handle": 536870953,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83733,12 +79578,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870985,
+          "handle": 536870952,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83760,17 +79604,24 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870986,
+      "default_action_handle": 536870953,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -83831,7 +79682,220 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777251,
+      "handle": 33554439,
+      "name": "forwarding_unicast_v4$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 3,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870953
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870952
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 75 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 75
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870953,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870952,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777249,
       "name": "forwarding.acl",
       "table_type": "match",
       "size": 256,
@@ -83999,7 +80063,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.l4_dst_port",
+                        "field_name": "fabric_metadata.original_ether_type",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 5,
                         "msb_mem_word_idx": 5,
@@ -84026,7 +80090,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.original_ether_type",
+                        "field_name": "ipv4.dst_addr",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -84053,7 +80117,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.dst_addr",
+                        "field_name": "ipv4.src_addr",
                         "lsb_mem_word_offset": 9,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -84062,7 +80126,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.l4_dst_port",
+                        "field_name": "fabric_metadata.original_ether_type",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -84089,7 +80153,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.original_ether_type",
+                        "field_name": "ipv4.dst_addr",
                         "lsb_mem_word_offset": 1,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84116,7 +80180,7 @@
                         "field_width": 4
                       },
                       {
-                        "field_name": "ipv4.src_addr",
+                        "field_name": "standard_metadata.ingress_port",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84125,7 +80189,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.dst_addr",
+                        "field_name": "ipv4.src_addr",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84152,7 +80216,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "standard_metadata.ingress_port",
+                        "field_name": "ethernet.dst_addr",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84161,7 +80225,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.src_addr",
+                        "field_name": "fabric_metadata.l4_dst_port",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84170,7 +80234,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ethernet.dst_addr",
+                        "field_name": "fabric_metadata.l4_dst_port",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84282,16 +80346,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 8,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -84306,22 +80745,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -84341,22 +81145,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -84371,7 +81165,7 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870990,
+                  "action_handle": 536870957,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
@@ -84381,44 +81175,27 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870987,
+                  "action_handle": 536870954,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 },
                 {
                   "action_name": "forwarding.duplicate_to_controller",
-                  "action_handle": 536870988,
+                  "action_handle": 536870955,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
                   "vliw_instruction": 2,
                   "vliw_instruction_full": 65,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_320",
-                      "param_type": "constant",
-                      "const_value": 320,
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 9
-                    }
-                  ]
+                  "immediate_fields": []
                 },
                 {
                   "action_name": "forwarding.drop",
-                  "action_handle": 536870989,
+                  "action_handle": 536870956,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
@@ -84432,7 +81209,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554440,
+          "name": "forwarding_acl$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -84446,7 +81229,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870990,
+          "handle": 536870957,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -84461,12 +81244,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870987,
+          "handle": 536870954,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84488,18 +81270,25 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         },
         {
           "name": "forwarding.duplicate_to_controller",
-          "handle": 536870988,
+          "handle": 536870955,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84514,13 +81303,12 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
-                { "type": "immediate", "name": "$constant0" },
+                { "type": "action_param", "name": "$constant0" },
                 { "type": "phv", "name": "H1" }
               ]
             }
@@ -84528,7 +81316,7 @@
         },
         {
           "name": "forwarding.drop",
-          "handle": 536870989,
+          "handle": 536870956,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84543,7 +81331,6 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
@@ -84556,7 +81343,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870990,
+      "default_action_handle": 536870957,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -84738,14 +81525,395 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777252,
+      "handle": 33554440,
+      "name": "forwarding_acl$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 8,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 0,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870957
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870954
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 320, "dest_width": 9 } ],
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "$constant0"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 39,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 89,
+                      "field_name": "--padding_25_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 320, "dest_width": 9 } ],
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "$constant0"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 39,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 25,
+                      "field_name": "--padding_25_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870955
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870956
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 90
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "nop",
+          "handle": 536870957,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870954,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "forwarding.duplicate_to_controller",
+          "handle": 536870955,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
+              "src": [
+                { "type": "action_param", "name": "$constant0" },
+                { "type": "phv", "name": "H1" }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "forwarding.drop",
+          "handle": 536870956,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "ig_intr_md_for_dprs.drop_ctl" },
+              "src": [
+                { "type": "immediate", "name": "1" },
+                { "type": "phv", "name": "B2" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777250,
       "name": "next.simple",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554438,
+          "handle": 33554441,
           "name": "next_simple$action"
         }
       ],
@@ -84759,7 +81927,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870995,
+      "default_action_handle": 536870962,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -84795,6 +81963,54 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 0,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -84817,54 +82033,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -84873,13 +82041,55 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -84895,48 +82105,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -84945,49 +82113,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -84999,19 +82155,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
+                        "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85021,6 +82165,30 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85029,31 +82197,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85065,7 +82209,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85077,7 +82221,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85089,31 +82257,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85125,7 +82269,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85137,40 +82281,64 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 4,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85179,36 +82347,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85221,13 +82359,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85245,19 +82383,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85269,60 +82437,24 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85335,13 +82467,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85353,37 +82521,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85401,19 +82539,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85425,42 +82593,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85473,7 +82605,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85491,7 +82635,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85503,13 +82653,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85521,67 +82689,67 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85593,37 +82761,19 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 0,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85635,24 +82785,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85665,13 +82797,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85683,42 +82851,18 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85731,13 +82875,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85747,6 +82897,24 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85755,37 +82923,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85803,13 +82941,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85825,6 +82957,42 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85833,13 +83001,67 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 3,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 14,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85857,7 +83079,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85885,21 +83125,9 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85911,13 +83139,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 15,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 17,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85953,6 +83187,264 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 16,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 17,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 18,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85971,7 +83463,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85979,17 +83495,155 @@
                     ]
                   },
                   {
-                    "hash_bit": 15,
+                    "hash_bit": 19,
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 5,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 20,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86017,14 +83671,98 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 21,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 22,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86043,6 +83781,18 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86061,540 +83811,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
                         "field_bit": 2,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86607,13 +83823,229 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 23,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 24,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 4,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 25,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 26,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86631,66 +84063,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86703,66 +84075,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86775,107 +84087,35 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
                       {
                         "field_bit": 6,
                         "field_name": "fabric_metadata.next_id",
@@ -86883,18 +84123,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86907,13 +84135,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 14,
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 27,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86937,7 +84171,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86949,19 +84183,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86971,13 +84193,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 7,
                         "field_name": "fabric_metadata.next_id",
@@ -86985,43 +84201,43 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 28,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
+                        "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -87049,13 +84265,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
@@ -87069,12 +84279,24 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 16,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 29,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -87099,6 +84321,18 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -87111,7 +84345,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -87121,13 +84355,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
@@ -87157,66 +84385,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   }
@@ -87227,7 +84395,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870995,
+                "action_handle": 536870962,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87237,7 +84405,7 @@
               },
               {
                 "action_name": "next.output",
-                "action_handle": 536870991,
+                "action_handle": 536870958,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87247,7 +84415,7 @@
               },
               {
                 "action_name": "next.set_vlan_output",
-                "action_handle": 536870992,
+                "action_handle": 536870959,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87257,7 +84425,7 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870993,
+                "action_handle": 536870960,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87267,7 +84435,7 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870994,
+                "action_handle": 536870961,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87695,7 +84863,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870995,
+          "handle": 536870962,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87714,7 +84882,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870991,
+          "handle": 536870958,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87749,7 +84917,7 @@
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870992,
+          "handle": 536870959,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87783,7 +84951,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -87791,7 +84959,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
@@ -87806,7 +84974,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870993,
+          "handle": 536870960,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87849,7 +85017,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -87866,7 +85034,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870994,
+          "handle": 536870961,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87918,7 +85086,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -87931,7 +85099,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -87946,7 +85114,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -87995,7 +85163,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554438,
+      "handle": 33554441,
       "name": "next_simple$action",
       "table_type": "action",
       "size": 3072,
@@ -88028,7 +85196,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870995
+              "action_handle": 536870962
             },
             {
               "memory_word_width": 128,
@@ -88069,7 +85237,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870991
+              "action_handle": 536870958
             },
             {
               "memory_word_width": 128,
@@ -88128,7 +85296,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870992
+              "action_handle": 536870959
             },
             {
               "memory_word_width": 128,
@@ -88205,7 +85373,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870993
+              "action_handle": 536870960
             },
             {
               "memory_word_width": 128,
@@ -88340,7 +85508,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870994
+              "action_handle": 536870961
             }
           ],
           "memory_resource_allocation": {
@@ -88357,7 +85525,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870995,
+          "handle": 536870962,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88376,7 +85544,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870991,
+          "handle": 536870958,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88411,7 +85579,7 @@
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870992,
+          "handle": 536870959,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88445,7 +85613,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -88453,7 +85621,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
@@ -88468,7 +85636,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870993,
+          "handle": 536870960,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88511,7 +85679,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -88528,7 +85696,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870994,
+          "handle": 536870961,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88580,7 +85748,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -88593,7 +85761,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -88608,7 +85776,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -88618,8 +85786,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777253,
-      "name": "tbl_act_8",
+      "handle": 16777251,
+      "name": "tbl_act_7",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -88644,8 +85812,8 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_8",
-                "action_handle": 536870996,
+                "action_name": "act_7",
+                "action_handle": 536870963,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -88662,8 +85830,8 @@
       },
       "actions": [
         {
-          "name": "act_8",
-          "handle": 536870996,
+          "name": "act_7",
+          "handle": 536870963,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88692,7 +85860,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870996,
+      "default_action_handle": 536870963,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -88708,14 +85876,14 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777254,
+      "handle": 16777252,
       "name": "next.hashed",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "indirect",
-          "handle": 33554439,
+          "handle": 33554442,
           "name": "next.ecmp_selector"
         }
       ],
@@ -88737,7 +85905,7 @@
       "stateful_table_refs": [],
       "default_selector_mask": 0,
       "default_selector_value": 0,
-      "default_action_handle": 536871000,
+      "default_action_handle": 536870967,
       "action_profile": "next.ecmp_selector",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -88773,6 +85941,30 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -88785,13 +85977,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88809,37 +86001,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88851,19 +86019,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 19,
+                        "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88875,43 +86061,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
+                        "field_bit": 29,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88923,54 +86091,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 2,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -88983,7 +86103,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88993,6 +86113,54 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89001,72 +86169,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 3,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89103,7 +86205,73 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89115,13 +86283,31 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 17,
+                        "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89139,7 +86325,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89161,36 +86359,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89199,61 +86367,13 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 5,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89265,7 +86385,55 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89277,54 +86445,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 6,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89343,22 +86463,70 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89367,19 +86535,49 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 17,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89397,7 +86595,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89407,36 +86605,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89445,42 +86613,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89493,7 +86625,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89505,7 +86637,43 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89517,19 +86685,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 18,
+                        "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89545,24 +86731,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89571,6 +86739,36 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89583,7 +86781,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89595,12 +86799,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89619,7 +86817,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89635,36 +86833,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89673,48 +86841,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89727,7 +86853,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89743,96 +86869,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 20,
@@ -89847,90 +86883,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89943,6 +86895,90 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 12,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89953,8 +86989,92 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 13,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 14,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89967,13 +87087,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89983,21 +87097,9 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90009,13 +87111,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90027,66 +87123,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90099,7 +87135,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 6,
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 15,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 5,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90111,7 +87171,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90127,13 +87187,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
@@ -90147,6 +87201,150 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 16,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 17,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90165,156 +87363,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90331,13 +87379,91 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 18,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 19,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
                         "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
@@ -90351,7 +87477,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90361,18 +87487,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 17,
@@ -90387,12 +87501,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90411,13 +87519,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90427,7 +87529,13 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 20,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
                         "field_bit": 0,
                         "field_name": "fabric_metadata.next_id",
@@ -90441,67 +87549,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90513,18 +87561,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90537,144 +87573,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90687,13 +87585,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90711,7 +87609,67 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 21,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90723,6 +87681,162 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 22,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 23,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 24,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90735,222 +87849,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90967,13 +87865,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
@@ -90987,13 +87879,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91005,25 +87909,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
+                        "field_bit": 29,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91031,10 +87917,22 @@
                     ]
                   },
                   {
-                    "hash_bit": 29,
+                    "hash_bit": 25,
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -91047,13 +87945,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91071,13 +87975,37 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 9,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 26,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91095,7 +88023,247 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 27,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 28,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 29,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91109,8 +88277,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536871000,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870967,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 0,
@@ -91119,8 +88287,8 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870997,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870964,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 1,
@@ -91129,8 +88297,8 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870998,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870965,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 2,
@@ -91139,8 +88307,8 @@
               },
               {
                 "action_name": "next.mpls_routing_v6",
-                "action_handle": 536870999,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870966,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 3,
@@ -91633,7 +88801,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536871000,
+          "handle": 536870967,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91652,7 +88820,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870997,
+          "handle": 536870964,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91695,7 +88863,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91712,7 +88880,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870998,
+          "handle": 536870965,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91764,7 +88932,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -91777,7 +88945,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91792,14 +88960,14 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870999,
+          "handle": 536870966,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91851,7 +89019,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -91864,7 +89032,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91879,7 +89047,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -91895,7 +89063,7 @@
       "selection_type": "fair",
       "how_referenced": "indirect",
       "max_port_pool_size": 120,
-      "bound_to_action_data_table_handle": 33554439,
+      "bound_to_action_data_table_handle": 33554442,
       "stage_tables": [
         {
           "stage_number": 10,
@@ -91922,7 +89090,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554439,
+      "handle": 33554442,
       "name": "next.ecmp_selector",
       "table_type": "action",
       "size": 64,
@@ -91955,7 +89123,7 @@
                   ]
                 }
               ],
-              "action_handle": 536871000
+              "action_handle": 536870967
             },
             {
               "memory_word_width": 128,
@@ -92032,7 +89200,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870997
+              "action_handle": 536870964
             },
             {
               "memory_word_width": 128,
@@ -92167,7 +89335,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870998
+              "action_handle": 536870965
             },
             {
               "memory_word_width": 128,
@@ -92302,7 +89470,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870999
+              "action_handle": 536870966
             }
           ],
           "memory_resource_allocation": {
@@ -92315,7 +89483,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536871000,
+          "handle": 536870967,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92334,7 +89502,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870997,
+          "handle": 536870964,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92377,7 +89545,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92394,7 +89562,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870998,
+          "handle": 536870965,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92446,7 +89614,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -92459,7 +89627,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92474,14 +89642,14 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870999,
+          "handle": 536870966,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92533,7 +89701,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -92546,7 +89714,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92561,7 +89729,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -92611,8 +89779,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777255,
-      "name": "tbl_act_11",
+      "handle": 16777253,
+      "name": "tbl_act_10",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -92637,9 +89805,9 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_11",
-                "action_handle": 536871001,
-                "table_name": "tbl_act_26",
+                "action_name": "act_10",
+                "action_handle": 536870968,
+                "table_name": "tbl_act_23",
                 "next_table": 0,
                 "next_table_full": 177,
                 "vliw_instruction": 1,
@@ -92655,8 +89823,8 @@
       },
       "actions": [
         {
-          "name": "act_11",
-          "handle": 536871001,
+          "name": "act_10",
+          "handle": 536870968,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92677,8 +89845,8 @@
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
-                { "type": "phv", "name": "W7" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W10" },
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92692,7 +89860,7 @@
           ]
         }
       ],
-      "default_action_handle": 536871001,
+      "default_action_handle": 536870968,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -92708,8 +89876,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777256,
-      "name": "tbl_act_9",
+      "handle": 16777254,
+      "name": "tbl_act_8",
       "table_type": "match",
       "size": 512,
       "preferred_match_type": "exact",
@@ -92734,8 +89902,8 @@
             "result_physical_buses": [ 1 ],
             "action_format": [
               {
-                "action_name": "act_9",
-                "action_handle": 536871002,
+                "action_name": "act_8",
+                "action_handle": 536870969,
                 "table_name": "--END_OF_PIPELINE--",
                 "next_table": 0,
                 "next_table_full": 255,
@@ -92752,8 +89920,8 @@
       },
       "actions": [
         {
-          "name": "act_9",
-          "handle": 536871002,
+          "name": "act_8",
+          "handle": 536870969,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92772,7 +89940,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536871002,
+      "default_action_handle": 536870969,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -92861,27 +90029,17 @@
     {
       "fully_qualified_name": "mau[0].dp.match_input_xbar_din_power_ctl",
       "name": "stage_0_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000001800000022000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[0].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_0_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000001800000008000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[1].dp.match_input_xbar_din_power_ctl",
       "name": "stage_1_match_input_xbar_din_power_ctl",
-      "value": "00000000000000000000000000000000000000800000000000000000000000de000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[1].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_1_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000080000000000000000000000018000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[2].dp.match_input_xbar_din_power_ctl",
       "name": "stage_2_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000000000000000000000000000040000000000000000000000003000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[3].dp.match_input_xbar_din_power_ctl",
@@ -92896,12 +90054,12 @@
     {
       "fully_qualified_name": "mau[4].dp.match_input_xbar_din_power_ctl",
       "name": "stage_4_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[5].dp.match_input_xbar_din_power_ctl",
       "name": "stage_5_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[5].dp.xbar_hash.hash.parity_group_mask",
@@ -92911,7 +90069,7 @@
     {
       "fully_qualified_name": "mau[6].dp.match_input_xbar_din_power_ctl",
       "name": "stage_6_match_input_xbar_din_power_ctl",
-      "value": "0000009000000040000000000000000000000000000000010000000000000000000000000000003800000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000004000000000000000000000000000000010000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[6].dp.xbar_hash.hash.parity_group_mask",
@@ -92921,7 +90079,7 @@
     {
       "fully_qualified_name": "mau[7].dp.match_input_xbar_din_power_ctl",
       "name": "stage_7_match_input_xbar_din_power_ctl",
-      "value": "0000009000000060000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[7].dp.xbar_hash.hash.parity_group_mask",
@@ -92931,12 +90089,12 @@
     {
       "fully_qualified_name": "mau[8].dp.match_input_xbar_din_power_ctl",
       "name": "stage_8_match_input_xbar_din_power_ctl",
-      "value": "000000d2000000c000000000000000000000002000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "000000120000000600000000000000000000002000000000000000000000000000000000000000b80000000000000000000000000000000100000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[9].dp.match_input_xbar_din_power_ctl",
       "name": "stage_9_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000008000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[9].dp.xbar_hash.hash.parity_group_mask",
@@ -92946,7 +90104,7 @@
     {
       "fully_qualified_name": "mau[10].dp.match_input_xbar_din_power_ctl",
       "name": "stage_10_match_input_xbar_din_power_ctl",
-      "value": "0000001200000000000000000000000000000060000000010000000000000000000000000000008000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "000000920000000000000000000000000000006000000001000000000000000000000000000000c000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[10].dp.xbar_hash.hash.parity_group_mask",
@@ -92956,7 +90114,7 @@
     {
       "fully_qualified_name": "mau[11].dp.match_input_xbar_din_power_ctl",
       "name": "stage_11_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[11].dp.xbar_hash.hash.parity_group_mask",
@@ -92964,4 +90122,4 @@
       "value": "00000001000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/fabric.p4info
old mode 100644
new mode 100755
similarity index 67%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/fabric.p4info
index cddc88a..3b4f3d5
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/fabric.p4info
@@ -372,145 +372,6 @@
   direct_resource_ids: 302023316
   size: 1024
 }
-tables {
-  preamble {
-    id: 33583029
-    name: "int_egress.int_metadata_insert.int_inst_0003"
-    alias: "int_inst_0003"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0003"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16831286
-  }
-  action_refs {
-    id: 16842664
-  }
-  action_refs {
-    id: 16816733
-  }
-  action_refs {
-    id: 16819517
-  }
-  action_refs {
-    id: 16794056
-  }
-  action_refs {
-    id: 16804966
-  }
-  action_refs {
-    id: 16779523
-  }
-  action_refs {
-    id: 16794789
-  }
-  action_refs {
-    id: 16834584
-  }
-  action_refs {
-    id: 16780654
-  }
-  action_refs {
-    id: 16841202
-  }
-  action_refs {
-    id: 16800429
-  }
-  action_refs {
-    id: 16842176
-  }
-  action_refs {
-    id: 16810248
-  }
-  action_refs {
-    id: 16786933
-  }
-  action_refs {
-    id: 16828419
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33570208
-    name: "int_egress.int_metadata_insert.int_inst_0407"
-    alias: "int_inst_0407"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0407"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16794499
-  }
-  action_refs {
-    id: 16785636
-  }
-  action_refs {
-    id: 16819629
-  }
-  action_refs {
-    id: 16816181
-  }
-  action_refs {
-    id: 16809168
-  }
-  action_refs {
-    id: 16798574
-  }
-  action_refs {
-    id: 16783327
-  }
-  action_refs {
-    id: 16796243
-  }
-  action_refs {
-    id: 16787702
-  }
-  action_refs {
-    id: 16778104
-  }
-  action_refs {
-    id: 16794531
-  }
-  action_refs {
-    id: 16805663
-  }
-  action_refs {
-    id: 16809122
-  }
-  action_refs {
-    id: 16783399
-  }
-  action_refs {
-    id: 16823769
-  }
-  action_refs {
-    id: 16797996
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33604372
-    name: "int_egress.int_prep"
-    alias: "int_prep"
-  }
-  action_refs {
-    id: 16841868
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 1024
-}
 actions {
   preamble {
     id: 16800567
@@ -756,97 +617,6 @@
 }
 actions {
   preamble {
-    id: 16831286
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i0"
-    alias: "int_set_header_0003_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16842664
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i1"
-    alias: "int_set_header_0003_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16816733
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i2"
-    alias: "int_set_header_0003_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16819517
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i3"
-    alias: "int_set_header_0003_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16794056
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i4"
-    alias: "int_set_header_0003_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16804966
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i5"
-    alias: "int_set_header_0003_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16779523
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i6"
-    alias: "int_set_header_0003_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16794789
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i7"
-    alias: "int_set_header_0003_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16834584
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i8"
-    alias: "int_set_header_0003_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16780654
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i9"
-    alias: "int_set_header_0003_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16841202
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i10"
-    alias: "int_set_header_0003_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16800429
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i11"
-    alias: "int_set_header_0003_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16842176
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i12"
-    alias: "int_set_header_0003_i12"
-  }
-}
-actions {
-  preamble {
     id: 16810248
     name: "int_egress.int_metadata_insert.int_set_header_0003_i13"
     alias: "int_set_header_0003_i13"
@@ -854,104 +624,6 @@
 }
 actions {
   preamble {
-    id: 16786933
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i14"
-    alias: "int_set_header_0003_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16828419
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i15"
-    alias: "int_set_header_0003_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16794499
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i0"
-    alias: "int_set_header_0407_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16785636
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i1"
-    alias: "int_set_header_0407_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16819629
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i2"
-    alias: "int_set_header_0407_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16816181
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i3"
-    alias: "int_set_header_0407_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16809168
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i4"
-    alias: "int_set_header_0407_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16798574
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i5"
-    alias: "int_set_header_0407_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16783327
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i6"
-    alias: "int_set_header_0407_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16796243
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i7"
-    alias: "int_set_header_0407_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16787702
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i8"
-    alias: "int_set_header_0407_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16778104
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i9"
-    alias: "int_set_header_0407_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16794531
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i10"
-    alias: "int_set_header_0407_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16805663
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i11"
-    alias: "int_set_header_0407_i11"
-  }
-}
-actions {
-  preamble {
     id: 16809122
     name: "int_egress.int_metadata_insert.int_set_header_0407_i12"
     alias: "int_set_header_0407_i12"
@@ -959,27 +631,6 @@
 }
 actions {
   preamble {
-    id: 16783399
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i13"
-    alias: "int_set_header_0407_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16823769
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i14"
-    alias: "int_set_header_0407_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16797996
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i15"
-    alias: "int_set_header_0407_i15"
-  }
-}
-actions {
-  preamble {
     id: 16796837
     name: "int_egress.int_outer_encap.int_update_ipv4"
     alias: "int_update_ipv4"
@@ -1005,11 +656,6 @@
     name: "int_egress.int_transit"
     alias: "int_transit"
   }
-  params {
-    id: 1
-    name: "switch_id"
-    bitwidth: 32
-  }
 }
 actions {
   preamble {
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/tofino.bin
similarity index 71%
rename from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/tofino.bin
index 96f5a23..be9c0e6 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/mavericks/tofino.bin
Binary files differ
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/context.json
old mode 100644
new mode 100755
similarity index 90%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/context.json
index a1aaebd..e3e6a49
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/context.json
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/context.json
@@ -1,5 +1,5 @@
 {
-  "build_date": "03/23/18 21:19:12",
+  "build_date": "03/24/18 19:15:07",
   "schema_version": "1.3.3",
   "compiler_version": "6.0.0-alpha.7",
   "program_name": "main",
@@ -14,7 +14,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32,7 +32,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -50,7 +50,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -68,7 +68,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -86,7 +86,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -104,7 +104,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -122,6 +122,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -147,11 +212,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -162,7 +227,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -173,7 +238,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -184,7 +249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -198,99 +263,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -300,8 +278,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -318,7 +296,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -332,11 +397,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -347,7 +412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -358,7 +423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -369,7 +434,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -383,7 +448,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -401,7 +466,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -419,29 +484,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -455,29 +502,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -495,7 +524,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -513,7 +542,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -531,7 +560,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -549,7 +578,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -616,7 +645,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -635,7 +664,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -654,7 +683,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -673,7 +702,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -718,7 +747,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -737,7 +766,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -756,7 +785,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -775,7 +804,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -820,7 +849,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -839,7 +868,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -858,7 +887,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -877,7 +906,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -891,7 +920,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -909,7 +938,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -927,61 +956,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -992,7 +967,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1003,7 +978,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1014,7 +989,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1028,11 +1003,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1043,7 +1018,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1054,7 +1029,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1065,7 +1040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1079,11 +1054,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1094,7 +1069,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1108,11 +1083,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1123,7 +1098,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1137,12 +1112,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -1159,24 +1188,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -1188,7 +1199,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1210,7 +1221,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1232,7 +1243,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1243,7 +1254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1257,7 +1268,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -1275,7 +1286,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -1290,7 +1301,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1301,7 +1312,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1315,11 +1326,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1330,7 +1341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1344,11 +1355,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1362,6 +1391,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -1399,7 +1446,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1410,7 +1457,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1421,7 +1468,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1432,7 +1479,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1443,7 +1490,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1454,7 +1501,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1465,7 +1512,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1476,7 +1523,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1516,7 +1563,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1527,7 +1574,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1538,7 +1585,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1549,7 +1596,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1560,7 +1607,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1571,7 +1618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1582,7 +1629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1593,7 +1640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1604,7 +1651,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1615,7 +1662,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1626,7 +1673,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1637,7 +1684,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1648,7 +1695,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1659,7 +1706,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1670,7 +1717,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1688,7 +1735,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1699,7 +1746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1710,7 +1757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1721,7 +1768,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1732,7 +1779,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1743,7 +1790,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1754,7 +1801,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1765,7 +1812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1783,7 +1830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1794,7 +1841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1805,7 +1852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1816,7 +1863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1827,7 +1874,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1838,7 +1885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1849,7 +1896,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -1867,7 +1914,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1885,7 +1932,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -1914,7 +1961,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -1950,7 +1997,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1961,7 +2008,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1979,7 +2026,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -2026,17 +2073,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -2046,7 +2082,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2064,8 +2100,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -2082,6 +2118,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -2096,11 +2168,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2114,7 +2186,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -2132,11 +2204,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2150,7 +2222,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -2168,29 +2240,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2204,11 +2258,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2222,7 +2276,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -2273,7 +2327,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -2302,94 +2356,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2407,7 +2378,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2425,7 +2396,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2443,7 +2414,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2461,7 +2432,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2479,23 +2450,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -2508,8 +2468,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -2526,25 +2486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2558,40 +2500,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2605,11 +2518,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2623,7 +2536,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -2746,41 +2659,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -2798,7 +2685,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -2810,6 +2723,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -2817,8 +2749,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -2836,8 +2768,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -2855,8 +2787,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -2875,7 +2807,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -2894,7 +2826,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -2912,8 +2844,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -2922,7 +2854,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -2931,25 +2863,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -2957,26 +2870,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -2988,51 +2882,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -3040,8 +2889,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -3059,8 +2908,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -3073,133 +2922,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -3214,25 +2936,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -3250,7 +2954,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -3268,7 +3099,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -3286,11 +3117,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3304,11 +3135,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3322,7 +3153,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -3340,11 +3171,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3355,7 +3186,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3369,11 +3200,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3387,7 +3218,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -3471,7 +3302,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -3522,7 +3353,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -3540,7 +3371,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -3558,7 +3389,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -3576,11 +3407,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -3598,7 +3429,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3609,7 +3440,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3620,7 +3451,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3631,7 +3462,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3682,7 +3513,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3693,7 +3524,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3704,7 +3535,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3715,7 +3546,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3755,7 +3586,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3766,7 +3597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3777,7 +3608,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3788,7 +3619,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3835,7 +3666,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3846,7 +3677,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3886,7 +3717,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3897,7 +3728,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3951,7 +3782,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3969,7 +3800,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -3987,7 +3818,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4016,7 +3847,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4045,7 +3876,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4056,7 +3887,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4074,23 +3905,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -4103,10 +3934,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -4114,10 +3945,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -4132,7 +3981,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4143,7 +4043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4154,7 +4054,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4165,7 +4065,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4176,7 +4076,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4187,7 +4087,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4223,7 +4123,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -4241,74 +4141,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -4325,7 +4163,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4334,6 +4172,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -4348,7 +4241,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4366,7 +4259,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4384,7 +4277,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4402,7 +4295,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4420,7 +4313,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4438,7 +4331,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4456,6 +4349,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -4481,11 +4439,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4496,7 +4454,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4507,7 +4465,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4518,7 +4476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4532,99 +4490,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -4634,8 +4505,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -4652,7 +4523,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4666,11 +4624,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4681,7 +4639,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4692,7 +4650,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4703,7 +4661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4717,7 +4675,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -4735,7 +4693,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -4753,29 +4711,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4789,29 +4729,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4829,7 +4751,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4847,7 +4769,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4865,7 +4787,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4883,7 +4805,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4950,7 +4872,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -4969,7 +4891,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -4988,7 +4910,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -5007,7 +4929,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -5052,7 +4974,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -5071,7 +4993,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -5090,7 +5012,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -5109,7 +5031,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -5154,7 +5076,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -5173,7 +5095,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -5192,7 +5114,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -5211,7 +5133,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -5225,7 +5147,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5243,7 +5165,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5261,61 +5183,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5326,7 +5194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5337,7 +5205,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5348,7 +5216,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5362,11 +5230,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5377,7 +5245,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5388,7 +5256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5399,7 +5267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5413,11 +5281,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5428,7 +5296,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5442,11 +5310,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5457,7 +5325,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5471,12 +5339,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -5493,24 +5415,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -5522,7 +5426,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5544,7 +5448,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5566,7 +5470,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5577,7 +5481,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5591,7 +5495,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -5609,7 +5513,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -5624,7 +5528,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5635,7 +5539,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5649,11 +5553,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5664,7 +5568,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5678,11 +5582,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5696,6 +5618,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -5733,7 +5673,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5744,7 +5684,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5755,7 +5695,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5766,7 +5706,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5777,7 +5717,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5788,7 +5728,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5799,7 +5739,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5810,7 +5750,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5850,7 +5790,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5861,7 +5801,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5872,7 +5812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5883,7 +5823,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5894,7 +5834,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5905,7 +5845,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5916,7 +5856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5927,7 +5867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5938,7 +5878,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5949,7 +5889,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5960,7 +5900,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5971,7 +5911,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5982,7 +5922,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5993,7 +5933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6004,7 +5944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6022,7 +5962,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6033,7 +5973,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6044,7 +5984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6055,7 +5995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6066,7 +6006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6077,7 +6017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6088,7 +6028,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6099,7 +6039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6117,7 +6057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6128,7 +6068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6139,7 +6079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6150,7 +6090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6161,7 +6101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6172,7 +6112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6183,7 +6123,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -6201,7 +6141,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6219,7 +6159,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6248,7 +6188,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6284,7 +6224,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6295,7 +6235,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6313,7 +6253,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -6360,17 +6300,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -6380,7 +6309,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6398,8 +6327,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -6416,6 +6345,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -6430,11 +6395,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6448,7 +6413,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -6466,11 +6431,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6484,7 +6449,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -6502,29 +6467,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6538,11 +6485,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6556,7 +6503,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -6607,7 +6554,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -6636,94 +6583,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6741,7 +6605,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6759,7 +6623,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6777,7 +6641,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6795,7 +6659,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6813,23 +6677,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -6842,8 +6695,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -6860,25 +6713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6892,40 +6727,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6939,11 +6745,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6957,7 +6763,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -7080,41 +6886,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -7132,7 +6912,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -7144,6 +6950,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -7151,8 +6976,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -7170,8 +6995,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -7189,8 +7014,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -7209,7 +7034,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -7228,7 +7053,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -7246,8 +7071,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -7256,7 +7081,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -7265,25 +7090,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -7291,26 +7097,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -7322,51 +7109,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -7374,8 +7116,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -7393,8 +7135,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -7407,133 +7149,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -7548,25 +7163,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -7584,7 +7181,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -7602,7 +7326,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -7620,11 +7344,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7638,11 +7362,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7656,7 +7380,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -7674,11 +7398,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7689,7 +7413,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7703,11 +7427,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7721,7 +7445,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -7805,7 +7529,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -7856,7 +7580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -7874,7 +7598,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -7892,7 +7616,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -7910,11 +7634,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -7932,7 +7656,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7943,7 +7667,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7954,7 +7678,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7965,7 +7689,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8016,7 +7740,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8027,7 +7751,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8038,7 +7762,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8049,7 +7773,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8089,7 +7813,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8100,7 +7824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8111,7 +7835,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8122,7 +7846,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8169,7 +7893,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8180,7 +7904,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8220,7 +7944,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8231,7 +7955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8285,7 +8009,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8303,7 +8027,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8321,7 +8045,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8350,7 +8074,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8379,7 +8103,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8390,7 +8114,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8408,23 +8132,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -8437,10 +8161,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -8448,10 +8172,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -8466,7 +8208,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8477,7 +8270,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8488,7 +8281,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8499,7 +8292,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8510,7 +8303,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8521,7 +8314,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8557,7 +8350,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -8575,74 +8368,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -8659,7 +8390,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8668,6 +8399,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -8682,7 +8468,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8700,7 +8486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8718,7 +8504,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8736,7 +8522,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8754,7 +8540,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8772,7 +8558,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8790,6 +8576,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -8815,11 +8666,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8830,7 +8681,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8841,7 +8692,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8852,7 +8703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8866,99 +8717,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -8968,8 +8732,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -8986,7 +8750,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9000,11 +8851,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9015,7 +8866,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9026,7 +8877,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9037,7 +8888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9051,7 +8902,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -9069,7 +8920,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -9087,29 +8938,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9123,29 +8956,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9163,7 +8978,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9181,7 +8996,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9199,7 +9014,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9217,7 +9032,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9284,7 +9099,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -9303,7 +9118,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -9322,7 +9137,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -9341,7 +9156,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -9386,7 +9201,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -9405,7 +9220,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -9424,7 +9239,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -9443,7 +9258,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -9488,7 +9303,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -9507,7 +9322,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -9526,7 +9341,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -9545,7 +9360,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -9559,7 +9374,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9577,7 +9392,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9595,61 +9410,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9660,7 +9421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9671,7 +9432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9682,7 +9443,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9696,11 +9457,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9711,7 +9472,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9722,7 +9483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9733,7 +9494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9747,11 +9508,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9762,7 +9523,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9776,11 +9537,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9791,7 +9552,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9805,12 +9566,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -9827,24 +9642,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -9856,7 +9653,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9878,7 +9675,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9900,7 +9697,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9911,7 +9708,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9925,7 +9722,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -9943,7 +9740,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -9958,7 +9755,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9969,7 +9766,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9983,11 +9780,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9998,7 +9795,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10012,11 +9809,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10030,6 +9845,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -10067,7 +9900,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10078,7 +9911,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10089,7 +9922,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10100,7 +9933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10111,7 +9944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10122,7 +9955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10133,7 +9966,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10144,7 +9977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10184,7 +10017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10195,7 +10028,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10206,7 +10039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10217,7 +10050,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10228,7 +10061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10239,7 +10072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10250,7 +10083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10261,7 +10094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10272,7 +10105,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10283,7 +10116,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10294,7 +10127,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10305,7 +10138,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10316,7 +10149,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10327,7 +10160,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10338,7 +10171,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10356,7 +10189,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10367,7 +10200,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10378,7 +10211,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10389,7 +10222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10400,7 +10233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10411,7 +10244,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10422,7 +10255,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10433,7 +10266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10451,7 +10284,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10462,7 +10295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10473,7 +10306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10484,7 +10317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10495,7 +10328,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10506,7 +10339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10517,7 +10350,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -10535,7 +10368,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10553,7 +10386,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10582,7 +10415,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -10618,7 +10451,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10629,7 +10462,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10647,7 +10480,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -10694,17 +10527,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -10714,7 +10536,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10732,8 +10554,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -10750,6 +10572,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -10764,11 +10622,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10782,7 +10640,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -10800,11 +10658,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10818,7 +10676,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -10836,29 +10694,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10872,11 +10712,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10890,7 +10730,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -10941,7 +10781,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -10970,94 +10810,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11075,7 +10832,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11093,7 +10850,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11111,7 +10868,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11129,7 +10886,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11147,23 +10904,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -11176,8 +10922,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -11194,25 +10940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11226,40 +10954,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11273,11 +10972,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11291,7 +10990,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -11414,41 +11113,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -11466,7 +11139,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -11478,6 +11177,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -11485,8 +11203,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -11504,8 +11222,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -11523,8 +11241,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -11543,7 +11261,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -11562,7 +11280,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -11580,8 +11298,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -11590,7 +11308,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -11599,25 +11317,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -11625,26 +11324,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -11656,51 +11336,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -11708,8 +11343,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -11727,8 +11362,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -11741,133 +11376,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -11882,25 +11390,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -11918,7 +11408,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -11936,7 +11553,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -11954,11 +11571,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11972,11 +11589,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11990,7 +11607,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -12008,11 +11625,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12023,7 +11640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12037,11 +11654,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12055,7 +11672,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -12139,7 +11756,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -12190,7 +11807,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -12208,7 +11825,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -12226,7 +11843,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -12244,11 +11861,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -12266,7 +11883,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12277,7 +11894,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12288,7 +11905,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12299,7 +11916,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12350,7 +11967,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12361,7 +11978,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12372,7 +11989,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12383,7 +12000,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12423,7 +12040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12434,7 +12051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12445,7 +12062,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12456,7 +12073,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12503,7 +12120,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12514,7 +12131,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12554,7 +12171,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12565,7 +12182,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12619,7 +12236,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12637,7 +12254,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12655,7 +12272,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12684,7 +12301,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12713,7 +12330,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -12724,7 +12341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -12742,23 +12359,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -12771,10 +12388,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -12782,10 +12399,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -12800,7 +12435,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12811,7 +12497,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12822,7 +12508,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12833,7 +12519,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12844,7 +12530,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12855,7 +12541,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12891,7 +12577,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -12909,74 +12595,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -12993,7 +12617,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13002,6 +12626,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -13016,7 +12695,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13034,7 +12713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13052,7 +12731,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13070,7 +12749,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13088,7 +12767,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13106,7 +12785,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13124,6 +12803,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -13149,11 +12893,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13164,7 +12908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13175,7 +12919,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13186,7 +12930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13200,99 +12944,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -13302,8 +12959,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -13320,7 +12977,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13334,11 +13078,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13349,7 +13093,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13360,7 +13104,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13371,7 +13115,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13385,7 +13129,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -13403,7 +13147,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -13421,29 +13165,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13457,29 +13183,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13497,7 +13205,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13515,7 +13223,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13533,7 +13241,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13551,7 +13259,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13618,7 +13326,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -13637,7 +13345,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -13656,7 +13364,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -13675,7 +13383,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -13720,7 +13428,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -13739,7 +13447,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -13758,7 +13466,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -13777,7 +13485,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -13822,7 +13530,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -13841,7 +13549,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -13860,7 +13568,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -13879,7 +13587,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -13893,7 +13601,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13911,7 +13619,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13929,61 +13637,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13994,7 +13648,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14005,7 +13659,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14016,7 +13670,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14030,11 +13684,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14045,7 +13699,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14056,7 +13710,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14067,7 +13721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14081,11 +13735,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14096,7 +13750,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14110,11 +13764,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14125,7 +13779,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14139,12 +13793,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -14161,24 +13869,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -14190,7 +13880,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14212,7 +13902,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14234,7 +13924,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14245,7 +13935,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14259,7 +13949,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -14277,7 +13967,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -14292,7 +13982,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14303,7 +13993,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14317,11 +14007,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14332,7 +14022,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14346,11 +14036,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14364,6 +14072,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -14401,7 +14127,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14412,7 +14138,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14423,7 +14149,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14434,7 +14160,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14445,7 +14171,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14456,7 +14182,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14467,7 +14193,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14478,7 +14204,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14518,7 +14244,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14529,7 +14255,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14540,7 +14266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14551,7 +14277,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14562,7 +14288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14573,7 +14299,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14584,7 +14310,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14595,7 +14321,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14606,7 +14332,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14617,7 +14343,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14628,7 +14354,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14639,7 +14365,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14650,7 +14376,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14661,7 +14387,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14672,7 +14398,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14690,7 +14416,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14701,7 +14427,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14712,7 +14438,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14723,7 +14449,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14734,7 +14460,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14745,7 +14471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14756,7 +14482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14767,7 +14493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14785,7 +14511,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14796,7 +14522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14807,7 +14533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14818,7 +14544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14829,7 +14555,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14840,7 +14566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14851,7 +14577,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -14869,7 +14595,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14887,7 +14613,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -14916,7 +14642,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -14952,7 +14678,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14963,7 +14689,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14981,7 +14707,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -15028,17 +14754,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -15048,7 +14763,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15066,8 +14781,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -15084,6 +14799,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -15098,11 +14849,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15116,7 +14867,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -15134,11 +14885,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15152,7 +14903,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -15170,29 +14921,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15206,11 +14939,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15224,7 +14957,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -15275,7 +15008,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -15304,94 +15037,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15409,7 +15059,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15427,7 +15077,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15445,7 +15095,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15463,7 +15113,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15481,23 +15131,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -15510,8 +15149,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -15528,25 +15167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15560,40 +15181,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15607,11 +15199,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15625,7 +15217,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -15748,41 +15340,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -15800,7 +15366,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -15812,6 +15404,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -15819,8 +15430,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -15838,8 +15449,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -15857,8 +15468,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -15877,7 +15488,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -15896,7 +15507,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -15914,8 +15525,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -15924,7 +15535,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -15933,25 +15544,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -15959,26 +15551,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -15990,51 +15563,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -16042,8 +15570,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -16061,8 +15589,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -16075,133 +15603,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -16216,25 +15617,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -16252,7 +15635,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -16270,7 +15780,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -16288,11 +15798,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16306,11 +15816,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16324,7 +15834,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -16342,11 +15852,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16357,7 +15867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16371,11 +15881,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16389,7 +15899,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -16473,7 +15983,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -16524,7 +16034,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -16542,7 +16052,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -16560,7 +16070,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -16578,11 +16088,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -16600,7 +16110,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16611,7 +16121,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16622,7 +16132,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16633,7 +16143,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16684,7 +16194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16695,7 +16205,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16706,7 +16216,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16717,7 +16227,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16757,7 +16267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16768,7 +16278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16779,7 +16289,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16790,7 +16300,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16837,7 +16347,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16848,7 +16358,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16888,7 +16398,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16899,7 +16409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16953,7 +16463,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16971,7 +16481,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -16989,7 +16499,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17018,7 +16528,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17047,7 +16557,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17058,7 +16568,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17076,23 +16586,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -17105,10 +16615,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -17116,10 +16626,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -17134,7 +16662,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17145,7 +16724,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17156,7 +16735,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17167,7 +16746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17178,7 +16757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17189,7 +16768,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17225,7 +16804,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -17243,74 +16822,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -17327,7 +16844,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17336,6 +16853,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -17350,7 +16922,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17368,7 +16940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17386,7 +16958,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17404,7 +16976,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17422,7 +16994,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17440,7 +17012,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17458,6 +17030,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -17483,11 +17120,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17498,7 +17135,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17509,7 +17146,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17520,7 +17157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17534,99 +17171,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -17636,8 +17186,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -17654,7 +17204,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17668,11 +17305,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17683,7 +17320,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17694,7 +17331,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17705,7 +17342,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17719,7 +17356,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -17737,7 +17374,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -17755,29 +17392,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17791,29 +17410,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17831,7 +17432,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17849,7 +17450,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17867,7 +17468,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17885,7 +17486,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17952,7 +17553,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -17971,7 +17572,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -17990,7 +17591,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -18009,7 +17610,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -18054,7 +17655,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -18073,7 +17674,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -18092,7 +17693,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -18111,7 +17712,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -18156,7 +17757,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -18175,7 +17776,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -18194,7 +17795,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -18213,7 +17814,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -18227,7 +17828,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18245,7 +17846,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18263,61 +17864,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18328,7 +17875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18339,7 +17886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18350,7 +17897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18364,11 +17911,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18379,7 +17926,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18390,7 +17937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18401,7 +17948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18415,11 +17962,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18430,7 +17977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18444,11 +17991,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18459,7 +18006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18473,12 +18020,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -18495,24 +18096,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -18524,7 +18107,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18546,7 +18129,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18568,7 +18151,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18579,7 +18162,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18593,7 +18176,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -18611,7 +18194,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -18626,7 +18209,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18637,7 +18220,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18651,11 +18234,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18666,7 +18249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18680,11 +18263,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18698,6 +18299,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -18735,7 +18354,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18746,7 +18365,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18757,7 +18376,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18768,7 +18387,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18779,7 +18398,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18790,7 +18409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18801,7 +18420,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18812,7 +18431,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18852,7 +18471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18863,7 +18482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18874,7 +18493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18885,7 +18504,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18896,7 +18515,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18907,7 +18526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18918,7 +18537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18929,7 +18548,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18940,7 +18559,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18951,7 +18570,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18962,7 +18581,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18973,7 +18592,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18984,7 +18603,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18995,7 +18614,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19006,7 +18625,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19024,7 +18643,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19035,7 +18654,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19046,7 +18665,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19057,7 +18676,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19068,7 +18687,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19079,7 +18698,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19090,7 +18709,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19101,7 +18720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19119,7 +18738,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19130,7 +18749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19141,7 +18760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19152,7 +18771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19163,7 +18782,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19174,7 +18793,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19185,7 +18804,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -19203,7 +18822,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19221,7 +18840,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19250,7 +18869,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19286,7 +18905,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19297,7 +18916,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19315,7 +18934,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -19362,17 +18981,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -19382,7 +18990,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19400,8 +19008,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -19418,6 +19026,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -19432,11 +19076,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19450,7 +19094,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -19468,11 +19112,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19486,7 +19130,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -19504,29 +19148,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19540,11 +19166,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19558,7 +19184,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -19609,7 +19235,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -19638,94 +19264,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19743,7 +19286,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19761,7 +19304,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19779,7 +19322,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19797,7 +19340,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19815,23 +19358,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -19844,8 +19376,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -19862,25 +19394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19894,40 +19408,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19941,11 +19426,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19959,7 +19444,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -20082,41 +19567,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -20134,7 +19593,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -20146,6 +19631,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -20153,8 +19657,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -20172,8 +19676,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -20191,8 +19695,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -20211,7 +19715,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -20230,7 +19734,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -20248,8 +19752,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -20258,7 +19762,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -20267,25 +19771,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -20293,26 +19778,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -20324,51 +19790,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -20376,8 +19797,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -20395,8 +19816,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -20409,133 +19830,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -20550,25 +19844,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -20586,7 +19862,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -20604,7 +20007,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -20622,11 +20025,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20640,11 +20043,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20658,7 +20061,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -20676,11 +20079,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20691,7 +20094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20705,11 +20108,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20723,7 +20126,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -20807,7 +20210,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -20858,7 +20261,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -20876,7 +20279,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -20894,7 +20297,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -20912,11 +20315,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -20934,7 +20337,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20945,7 +20348,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20956,7 +20359,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20967,7 +20370,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21018,7 +20421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21029,7 +20432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21040,7 +20443,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21051,7 +20454,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21091,7 +20494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21102,7 +20505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21113,7 +20516,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21124,7 +20527,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21171,7 +20574,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21182,7 +20585,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21222,7 +20625,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21233,7 +20636,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21287,7 +20690,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21305,7 +20708,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21323,7 +20726,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21352,7 +20755,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21381,7 +20784,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21392,7 +20795,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21410,23 +20813,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -21439,10 +20842,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -21450,10 +20853,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -21468,7 +20889,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21479,7 +20951,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21490,7 +20962,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21501,7 +20973,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21512,7 +20984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21523,7 +20995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21559,7 +21031,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -21577,74 +21049,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -21661,7 +21071,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21670,6 +21080,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -21684,7 +21149,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21702,7 +21167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21720,7 +21185,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21738,7 +21203,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21756,7 +21221,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21774,7 +21239,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21792,6 +21257,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -21817,11 +21347,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21832,7 +21362,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21843,7 +21373,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21854,7 +21384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21868,99 +21398,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -21970,8 +21413,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -21988,7 +21431,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22002,11 +21532,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22017,7 +21547,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22028,7 +21558,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22039,7 +21569,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22053,7 +21583,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -22071,7 +21601,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -22089,29 +21619,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22125,29 +21637,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22165,7 +21659,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22183,7 +21677,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22201,7 +21695,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22219,7 +21713,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22286,7 +21780,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -22305,7 +21799,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -22324,7 +21818,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -22343,7 +21837,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -22388,7 +21882,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -22407,7 +21901,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -22426,7 +21920,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -22445,7 +21939,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -22490,7 +21984,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -22509,7 +22003,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -22528,7 +22022,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -22547,7 +22041,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -22561,7 +22055,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22579,7 +22073,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22597,61 +22091,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22662,7 +22102,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22673,7 +22113,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22684,7 +22124,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22698,11 +22138,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22713,7 +22153,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22724,7 +22164,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22735,7 +22175,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22749,11 +22189,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22764,7 +22204,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22778,11 +22218,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22793,7 +22233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22807,12 +22247,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -22829,24 +22323,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -22858,7 +22334,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22880,7 +22356,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22902,7 +22378,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22913,7 +22389,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22927,7 +22403,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -22945,7 +22421,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -22960,7 +22436,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22971,7 +22447,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22985,11 +22461,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23000,7 +22476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23014,11 +22490,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23032,6 +22526,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -23069,7 +22581,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23080,7 +22592,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23091,7 +22603,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23102,7 +22614,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23113,7 +22625,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23124,7 +22636,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23135,7 +22647,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23146,7 +22658,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23186,7 +22698,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23197,7 +22709,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23208,7 +22720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23219,7 +22731,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23230,7 +22742,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23241,7 +22753,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23252,7 +22764,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23263,7 +22775,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23274,7 +22786,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23285,7 +22797,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23296,7 +22808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23307,7 +22819,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23318,7 +22830,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23329,7 +22841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23340,7 +22852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23358,7 +22870,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23369,7 +22881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23380,7 +22892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23391,7 +22903,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23402,7 +22914,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23413,7 +22925,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23424,7 +22936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23435,7 +22947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23453,7 +22965,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23464,7 +22976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23475,7 +22987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23486,7 +22998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23497,7 +23009,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23508,7 +23020,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23519,7 +23031,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -23537,7 +23049,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23555,7 +23067,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23584,7 +23096,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -23620,7 +23132,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23631,7 +23143,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23649,7 +23161,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -23696,17 +23208,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -23716,7 +23217,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23734,8 +23235,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -23752,6 +23253,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -23766,11 +23303,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23784,7 +23321,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -23802,11 +23339,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23820,7 +23357,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -23838,29 +23375,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23874,11 +23393,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23892,7 +23411,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -23943,7 +23462,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -23972,94 +23491,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24077,7 +23513,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24095,7 +23531,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24113,7 +23549,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24131,7 +23567,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24149,23 +23585,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -24178,8 +23603,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -24196,25 +23621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24228,40 +23635,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24275,11 +23653,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24293,7 +23671,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -24416,41 +23794,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -24468,7 +23820,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -24480,6 +23858,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -24487,8 +23884,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -24506,8 +23903,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -24525,8 +23922,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -24545,7 +23942,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -24564,7 +23961,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -24582,8 +23979,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -24592,7 +23989,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -24601,25 +23998,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -24627,26 +24005,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -24658,51 +24017,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -24710,8 +24024,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -24729,8 +24043,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -24743,133 +24057,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -24884,25 +24071,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -24920,7 +24089,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -24938,7 +24234,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -24956,11 +24252,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24974,11 +24270,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24992,7 +24288,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -25010,11 +24306,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25025,7 +24321,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25039,11 +24335,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25057,7 +24353,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -25141,7 +24437,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -25192,7 +24488,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -25210,7 +24506,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -25228,7 +24524,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -25246,11 +24542,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -25268,7 +24564,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25279,7 +24575,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25290,7 +24586,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25301,7 +24597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25352,7 +24648,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25363,7 +24659,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25374,7 +24670,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25385,7 +24681,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25425,7 +24721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25436,7 +24732,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25447,7 +24743,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25458,7 +24754,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25505,7 +24801,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25516,7 +24812,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25556,7 +24852,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25567,7 +24863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25621,7 +24917,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25639,7 +24935,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25657,7 +24953,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25686,7 +24982,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -25715,7 +25011,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -25726,7 +25022,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -25744,23 +25040,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -25773,10 +25069,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -25784,10 +25080,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -25802,7 +25116,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25813,7 +25178,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25824,7 +25189,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25835,7 +25200,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25846,7 +25211,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25857,7 +25222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -25893,7 +25258,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -25911,74 +25276,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -25995,7 +25298,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26004,6 +25307,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -26018,7 +25376,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26036,7 +25394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26054,7 +25412,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26072,7 +25430,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26090,7 +25448,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26108,7 +25466,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26126,6 +25484,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -26151,11 +25574,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26166,7 +25589,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26177,7 +25600,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26188,7 +25611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26202,99 +25625,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -26304,8 +25640,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -26322,7 +25658,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26336,11 +25759,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26351,7 +25774,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26362,7 +25785,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26373,7 +25796,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26387,7 +25810,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -26405,7 +25828,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -26423,29 +25846,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -26459,29 +25864,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26499,7 +25886,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26517,7 +25904,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26535,7 +25922,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26553,7 +25940,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -26620,7 +26007,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -26639,7 +26026,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -26658,7 +26045,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -26677,7 +26064,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -26722,7 +26109,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -26741,7 +26128,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -26760,7 +26147,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -26779,7 +26166,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -26824,7 +26211,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -26843,7 +26230,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -26862,7 +26249,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -26881,7 +26268,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -26895,7 +26282,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26913,7 +26300,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26931,61 +26318,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26996,7 +26329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27007,7 +26340,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27018,7 +26351,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27032,11 +26365,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27047,7 +26380,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27058,7 +26391,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27069,7 +26402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27083,11 +26416,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27098,7 +26431,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27112,11 +26445,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27127,7 +26460,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27141,12 +26474,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -27163,24 +26550,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -27192,7 +26561,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27214,7 +26583,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27236,7 +26605,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27247,7 +26616,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27261,7 +26630,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -27279,7 +26648,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -27294,7 +26663,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27305,7 +26674,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27319,11 +26688,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27334,7 +26703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27348,11 +26717,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27366,6 +26753,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -27403,7 +26808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27414,7 +26819,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27425,7 +26830,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27436,7 +26841,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27447,7 +26852,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27458,7 +26863,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27469,7 +26874,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27480,7 +26885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27520,7 +26925,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27531,7 +26936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27542,7 +26947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27553,7 +26958,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27564,7 +26969,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27575,7 +26980,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27586,7 +26991,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27597,7 +27002,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27608,7 +27013,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27619,7 +27024,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27630,7 +27035,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27641,7 +27046,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27652,7 +27057,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27663,7 +27068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27674,7 +27079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27692,7 +27097,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27703,7 +27108,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27714,7 +27119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27725,7 +27130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27736,7 +27141,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27747,7 +27152,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27758,7 +27163,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27769,7 +27174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27787,7 +27192,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27798,7 +27203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27809,7 +27214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27820,7 +27225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27831,7 +27236,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27842,7 +27247,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27853,7 +27258,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -27871,7 +27276,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27889,7 +27294,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -27918,7 +27323,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -27954,7 +27359,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27965,7 +27370,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -27983,7 +27388,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -28030,17 +27435,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -28050,7 +27444,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28068,8 +27462,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -28086,6 +27480,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -28100,11 +27530,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28118,7 +27548,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -28136,11 +27566,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28154,7 +27584,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -28172,29 +27602,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28208,11 +27620,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -28226,7 +27638,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -28277,7 +27689,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -28306,94 +27718,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28411,7 +27740,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28429,7 +27758,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28447,7 +27776,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28465,7 +27794,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28483,23 +27812,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -28512,8 +27830,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -28530,25 +27848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28562,40 +27862,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28609,11 +27880,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -28627,7 +27898,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -28750,41 +28021,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -28802,7 +28047,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -28814,6 +28085,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -28821,8 +28111,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -28840,8 +28130,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -28859,8 +28149,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -28879,7 +28169,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -28898,7 +28188,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -28916,8 +28206,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -28926,7 +28216,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -28935,25 +28225,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -28961,26 +28232,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -28992,51 +28244,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -29044,8 +28251,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -29063,8 +28270,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -29077,133 +28284,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -29218,25 +28298,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -29254,7 +28316,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -29272,7 +28461,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -29290,11 +28479,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29308,11 +28497,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29326,7 +28515,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -29344,11 +28533,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29359,7 +28548,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29373,11 +28562,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -29391,7 +28580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -29475,7 +28664,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -29526,7 +28715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -29544,7 +28733,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -29562,7 +28751,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -29580,11 +28769,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -29602,7 +28791,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29613,7 +28802,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29624,7 +28813,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29635,7 +28824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29686,7 +28875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29697,7 +28886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29708,7 +28897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29719,7 +28908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29759,7 +28948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29770,7 +28959,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29781,7 +28970,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29792,7 +28981,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29839,7 +29028,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29850,7 +29039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29890,7 +29079,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29901,7 +29090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29955,7 +29144,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29973,7 +29162,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -29991,7 +29180,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30020,7 +29209,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30049,7 +29238,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30060,7 +29249,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30078,23 +29267,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -30107,10 +29296,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -30118,10 +29307,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -30136,7 +29343,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30147,7 +29405,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30158,7 +29416,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30169,7 +29427,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30180,7 +29438,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30191,7 +29449,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30227,7 +29485,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -30245,74 +29503,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -30329,7 +29525,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -30338,6 +29534,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -30352,7 +29603,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30370,7 +29621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30388,7 +29639,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30406,7 +29657,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30424,7 +29675,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30442,7 +29693,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30460,6 +29711,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -30485,11 +29801,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30500,7 +29816,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30511,7 +29827,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30522,7 +29838,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30536,99 +29852,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -30638,8 +29867,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -30656,7 +29885,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30670,11 +29986,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30685,7 +30001,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30696,7 +30012,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30707,7 +30023,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30721,7 +30037,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -30739,7 +30055,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -30757,29 +30073,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -30793,29 +30091,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30833,7 +30113,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30851,7 +30131,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30869,7 +30149,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30887,7 +30167,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -30954,7 +30234,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -30973,7 +30253,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -30992,7 +30272,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -31011,7 +30291,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -31056,7 +30336,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -31075,7 +30355,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -31094,7 +30374,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -31113,7 +30393,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -31158,7 +30438,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -31177,7 +30457,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -31196,7 +30476,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -31215,7 +30495,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -31229,7 +30509,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31247,7 +30527,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31265,61 +30545,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31330,7 +30556,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31341,7 +30567,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31352,7 +30578,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31366,11 +30592,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31381,7 +30607,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31392,7 +30618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31403,7 +30629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31417,11 +30643,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31432,7 +30658,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31446,11 +30672,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31461,7 +30687,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31475,12 +30701,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -31497,24 +30777,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -31526,7 +30788,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31548,7 +30810,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31570,7 +30832,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31581,7 +30843,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31595,7 +30857,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -31613,7 +30875,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -31628,7 +30890,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31639,7 +30901,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31653,11 +30915,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31668,7 +30930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31682,11 +30944,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -31700,6 +30980,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -31737,7 +31035,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31748,7 +31046,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31759,7 +31057,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31770,7 +31068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31781,7 +31079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31792,7 +31090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31803,7 +31101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31814,7 +31112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31854,7 +31152,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31865,7 +31163,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31876,7 +31174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31887,7 +31185,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31898,7 +31196,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31909,7 +31207,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31920,7 +31218,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31931,7 +31229,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31942,7 +31240,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31953,7 +31251,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31964,7 +31262,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31975,7 +31273,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31986,7 +31284,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -31997,7 +31295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32008,7 +31306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32026,7 +31324,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32037,7 +31335,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32048,7 +31346,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32059,7 +31357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32070,7 +31368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32081,7 +31379,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32092,7 +31390,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32103,7 +31401,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32121,7 +31419,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32132,7 +31430,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32143,7 +31441,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32154,7 +31452,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32165,7 +31463,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32176,7 +31474,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32187,7 +31485,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -32205,7 +31503,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32223,7 +31521,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32252,7 +31550,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32288,7 +31586,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -32299,7 +31597,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -32317,7 +31615,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -32364,17 +31662,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -32384,7 +31671,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32402,8 +31689,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -32420,6 +31707,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -32434,11 +31757,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32452,7 +31775,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -32470,11 +31793,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32488,7 +31811,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -32506,29 +31829,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32542,11 +31847,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -32560,7 +31865,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -32611,7 +31916,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -32640,94 +31945,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32745,7 +31967,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32763,7 +31985,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32781,7 +32003,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32799,7 +32021,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32817,23 +32039,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -32846,8 +32057,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -32864,25 +32075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32896,40 +32089,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32943,11 +32107,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -32961,7 +32125,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -33084,41 +32248,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -33136,7 +32274,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -33148,6 +32312,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -33155,8 +32338,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -33174,8 +32357,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -33193,8 +32376,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -33213,7 +32396,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -33232,7 +32415,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -33250,8 +32433,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -33260,7 +32443,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -33269,25 +32452,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -33295,26 +32459,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -33326,51 +32471,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -33378,8 +32478,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -33397,8 +32497,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -33411,133 +32511,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -33552,25 +32525,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -33588,7 +32543,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -33606,7 +32688,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -33624,11 +32706,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33642,11 +32724,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33660,7 +32742,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -33678,11 +32760,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33693,7 +32775,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33707,11 +32789,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -33725,7 +32807,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -33809,7 +32891,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -33860,7 +32942,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -33878,7 +32960,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -33896,7 +32978,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -33914,11 +32996,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -33936,7 +33018,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33947,7 +33029,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33958,7 +33040,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -33969,7 +33051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34020,7 +33102,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34031,7 +33113,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34042,7 +33124,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34053,7 +33135,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34093,7 +33175,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34104,7 +33186,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34115,7 +33197,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34126,7 +33208,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34173,7 +33255,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34184,7 +33266,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34224,7 +33306,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34235,7 +33317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34289,7 +33371,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34307,7 +33389,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34325,7 +33407,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34354,7 +33436,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34383,7 +33465,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -34394,7 +33476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -34412,23 +33494,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -34441,10 +33523,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -34452,10 +33534,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -34470,7 +33570,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34481,7 +33632,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34492,7 +33643,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34503,7 +33654,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34514,7 +33665,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34525,7 +33676,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34561,7 +33712,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -34579,74 +33730,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -34663,7 +33752,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -34672,6 +33761,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -34686,7 +33830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34704,7 +33848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34722,7 +33866,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34740,7 +33884,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34758,7 +33902,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34776,7 +33920,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34794,6 +33938,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -34819,11 +34028,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34834,7 +34043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34845,7 +34054,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34856,7 +34065,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -34870,99 +34079,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -34972,8 +34094,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -34990,7 +34112,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35004,11 +34213,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35019,7 +34228,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35030,7 +34239,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35041,7 +34250,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35055,7 +34264,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -35073,7 +34282,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -35091,29 +34300,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -35127,29 +34318,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35167,7 +34340,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35185,7 +34358,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35203,7 +34376,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35221,7 +34394,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -35288,7 +34461,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -35307,7 +34480,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -35326,7 +34499,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -35345,7 +34518,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -35390,7 +34563,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -35409,7 +34582,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -35428,7 +34601,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -35447,7 +34620,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -35492,7 +34665,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -35511,7 +34684,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -35530,7 +34703,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -35549,7 +34722,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -35563,7 +34736,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35581,7 +34754,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35599,61 +34772,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35664,7 +34783,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35675,7 +34794,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35686,7 +34805,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35700,11 +34819,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35715,7 +34834,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35726,7 +34845,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35737,7 +34856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35751,11 +34870,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35766,7 +34885,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35780,11 +34899,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35795,7 +34914,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35809,12 +34928,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -35831,24 +35004,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -35860,7 +35015,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35882,7 +35037,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35904,7 +35059,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35915,7 +35070,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35929,7 +35084,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -35947,7 +35102,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -35962,7 +35117,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35973,7 +35128,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -35987,11 +35142,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36002,7 +35157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36016,11 +35171,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36034,6 +35207,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -36071,7 +35262,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36082,7 +35273,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36093,7 +35284,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36104,7 +35295,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36115,7 +35306,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36126,7 +35317,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36137,7 +35328,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36148,7 +35339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36188,7 +35379,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36199,7 +35390,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36210,7 +35401,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36221,7 +35412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36232,7 +35423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36243,7 +35434,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36254,7 +35445,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36265,7 +35456,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36276,7 +35467,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36287,7 +35478,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36298,7 +35489,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36309,7 +35500,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36320,7 +35511,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36331,7 +35522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36342,7 +35533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36360,7 +35551,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36371,7 +35562,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36382,7 +35573,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36393,7 +35584,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36404,7 +35595,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36415,7 +35606,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36426,7 +35617,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36437,7 +35628,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36455,7 +35646,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36466,7 +35657,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36477,7 +35668,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36488,7 +35679,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36499,7 +35690,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36510,7 +35701,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36521,7 +35712,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -36539,7 +35730,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36557,7 +35748,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36586,7 +35777,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -36622,7 +35813,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36633,7 +35824,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -36651,7 +35842,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -36698,17 +35889,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -36718,7 +35898,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36736,8 +35916,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -36754,6 +35934,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -36768,11 +35984,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36786,7 +36002,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -36804,11 +36020,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36822,7 +36038,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -36840,29 +36056,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36876,11 +36074,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -36894,7 +36092,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -36945,7 +36143,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -36974,94 +36172,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37079,7 +36194,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37097,7 +36212,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37115,7 +36230,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37133,7 +36248,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37151,23 +36266,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -37180,8 +36284,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -37198,25 +36302,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37230,40 +36316,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37277,11 +36334,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -37295,7 +36352,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -37418,41 +36475,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -37470,7 +36501,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -37482,6 +36539,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -37489,8 +36565,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -37508,8 +36584,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -37527,8 +36603,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -37547,7 +36623,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -37566,7 +36642,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -37584,8 +36660,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -37594,7 +36670,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -37603,25 +36679,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -37629,26 +36686,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -37660,51 +36698,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -37712,8 +36705,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -37731,8 +36724,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -37745,133 +36738,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -37886,25 +36752,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -37922,7 +36770,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -37940,7 +36915,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -37958,11 +36933,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -37976,11 +36951,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -37994,7 +36969,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -38012,11 +36987,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38027,7 +37002,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38041,11 +37016,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38059,7 +37034,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -38143,7 +37118,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -38194,7 +37169,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -38212,7 +37187,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -38230,7 +37205,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -38248,11 +37223,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -38270,7 +37245,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38281,7 +37256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38292,7 +37267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38303,7 +37278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38354,7 +37329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38365,7 +37340,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38376,7 +37351,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38387,7 +37362,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38427,7 +37402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38438,7 +37413,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38449,7 +37424,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38460,7 +37435,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38507,7 +37482,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38518,7 +37493,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38558,7 +37533,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38569,7 +37544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38623,7 +37598,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38641,7 +37616,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38659,7 +37634,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38688,7 +37663,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -38717,7 +37692,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -38728,7 +37703,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -38746,23 +37721,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -38775,10 +37750,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -38786,10 +37761,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -38804,7 +37797,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38815,7 +37859,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38826,7 +37870,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38837,7 +37881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38848,7 +37892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38859,7 +37903,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -38895,7 +37939,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -38913,74 +37957,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -38997,7 +37979,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39006,6 +37988,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -39020,7 +38057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39038,7 +38075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39056,7 +38093,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39074,7 +38111,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39092,7 +38129,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39110,7 +38147,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39128,6 +38165,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -39153,11 +38255,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39168,7 +38270,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39179,7 +38281,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39190,7 +38292,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39204,99 +38306,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -39306,8 +38321,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -39324,7 +38339,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39338,11 +38440,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39353,7 +38455,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39364,7 +38466,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39375,7 +38477,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39389,7 +38491,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -39407,7 +38509,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -39425,29 +38527,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -39461,29 +38545,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39501,7 +38567,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39519,7 +38585,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39537,7 +38603,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39555,7 +38621,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -39622,7 +38688,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -39641,7 +38707,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -39660,7 +38726,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -39679,7 +38745,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -39724,7 +38790,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -39743,7 +38809,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -39762,7 +38828,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -39781,7 +38847,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -39826,7 +38892,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -39845,7 +38911,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -39864,7 +38930,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -39883,7 +38949,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -39897,7 +38963,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39915,7 +38981,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39933,61 +38999,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -39998,7 +39010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40009,7 +39021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40020,7 +39032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40034,11 +39046,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40049,7 +39061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40060,7 +39072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40071,7 +39083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40085,11 +39097,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40100,7 +39112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40114,11 +39126,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40129,7 +39141,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40143,12 +39155,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -40165,24 +39231,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -40194,7 +39242,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40216,7 +39264,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40238,7 +39286,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40249,7 +39297,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40263,7 +39311,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -40281,7 +39329,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -40296,7 +39344,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40307,7 +39355,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40321,11 +39369,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40336,7 +39384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40350,11 +39398,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40368,6 +39434,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -40405,7 +39489,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40416,7 +39500,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40427,7 +39511,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40438,7 +39522,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40449,7 +39533,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40460,7 +39544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40471,7 +39555,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40482,7 +39566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40522,7 +39606,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40533,7 +39617,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40544,7 +39628,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40555,7 +39639,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40566,7 +39650,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40577,7 +39661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40588,7 +39672,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40599,7 +39683,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40610,7 +39694,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40621,7 +39705,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40632,7 +39716,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40643,7 +39727,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40654,7 +39738,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40665,7 +39749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40676,7 +39760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40694,7 +39778,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40705,7 +39789,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40716,7 +39800,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40727,7 +39811,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40738,7 +39822,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40749,7 +39833,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40760,7 +39844,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40771,7 +39855,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40789,7 +39873,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40800,7 +39884,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40811,7 +39895,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40822,7 +39906,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40833,7 +39917,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40844,7 +39928,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40855,7 +39939,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -40873,7 +39957,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40891,7 +39975,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -40920,7 +40004,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -40956,7 +40040,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40967,7 +40051,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -40985,7 +40069,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -41032,17 +40116,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -41052,7 +40125,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41070,8 +40143,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -41088,6 +40161,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -41102,11 +40211,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41120,7 +40229,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -41138,11 +40247,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41156,7 +40265,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -41174,29 +40283,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41210,11 +40301,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -41228,7 +40319,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -41279,7 +40370,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -41308,94 +40399,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41413,7 +40421,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41431,7 +40439,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41449,7 +40457,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41467,7 +40475,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41485,23 +40493,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -41514,8 +40511,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -41532,25 +40529,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41564,40 +40543,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41611,11 +40561,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -41629,7 +40579,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -41752,41 +40702,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -41804,7 +40728,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -41816,6 +40766,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -41823,8 +40792,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -41842,8 +40811,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -41861,8 +40830,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -41881,7 +40850,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -41900,7 +40869,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -41918,8 +40887,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -41928,7 +40897,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -41937,25 +40906,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -41963,26 +40913,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -41994,51 +40925,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -42046,8 +40932,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -42065,8 +40951,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -42079,133 +40965,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -42220,25 +40979,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -42256,7 +40997,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -42274,7 +41142,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -42292,11 +41160,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42310,11 +41178,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42328,7 +41196,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -42346,11 +41214,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42361,7 +41229,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42375,11 +41243,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -42393,7 +41261,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -42477,7 +41345,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -42528,7 +41396,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -42546,7 +41414,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -42564,7 +41432,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -42582,11 +41450,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -42604,7 +41472,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42615,7 +41483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42626,7 +41494,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42637,7 +41505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42688,7 +41556,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42699,7 +41567,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42710,7 +41578,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42721,7 +41589,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42761,7 +41629,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42772,7 +41640,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42783,7 +41651,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42794,7 +41662,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42841,7 +41709,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42852,7 +41720,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42892,7 +41760,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42903,7 +41771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42957,7 +41825,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42975,7 +41843,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -42993,7 +41861,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43022,7 +41890,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43051,7 +41919,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43062,7 +41930,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43080,23 +41948,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -43109,10 +41977,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -43120,10 +41988,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -43138,7 +42024,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43149,7 +42086,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43160,7 +42097,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43171,7 +42108,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43182,7 +42119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43193,7 +42130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43229,7 +42166,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -43247,74 +42184,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -43331,7 +42206,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -43340,6 +42215,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -43354,7 +42284,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43372,7 +42302,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43390,7 +42320,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43408,7 +42338,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43426,7 +42356,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43444,7 +42374,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43462,6 +42392,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -43487,11 +42482,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43502,7 +42497,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43513,7 +42508,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43524,7 +42519,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43538,99 +42533,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -43640,8 +42548,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -43658,7 +42566,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43672,11 +42667,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43687,7 +42682,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43698,7 +42693,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43709,7 +42704,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43723,7 +42718,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -43741,7 +42736,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -43759,29 +42754,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -43795,29 +42772,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43835,7 +42794,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43853,7 +42812,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43871,7 +42830,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43889,7 +42848,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -43956,7 +42915,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -43975,7 +42934,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -43994,7 +42953,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -44013,7 +42972,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -44058,7 +43017,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -44077,7 +43036,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -44096,7 +43055,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -44115,7 +43074,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -44160,7 +43119,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -44179,7 +43138,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -44198,7 +43157,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -44217,7 +43176,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -44231,7 +43190,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44249,7 +43208,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44267,61 +43226,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44332,7 +43237,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44343,7 +43248,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44354,7 +43259,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44368,11 +43273,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44383,7 +43288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44394,7 +43299,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44405,7 +43310,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44419,11 +43324,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44434,7 +43339,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44448,11 +43353,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44463,7 +43368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44477,12 +43382,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -44499,24 +43458,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -44528,7 +43469,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44550,7 +43491,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44572,7 +43513,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44583,7 +43524,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44597,7 +43538,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -44615,7 +43556,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -44630,7 +43571,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44641,7 +43582,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44655,11 +43596,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44670,7 +43611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44684,11 +43625,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -44702,6 +43661,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -44739,7 +43716,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44750,7 +43727,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44761,7 +43738,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44772,7 +43749,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44783,7 +43760,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44794,7 +43771,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44805,7 +43782,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44816,7 +43793,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44856,7 +43833,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44867,7 +43844,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44878,7 +43855,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44889,7 +43866,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44900,7 +43877,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44911,7 +43888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44922,7 +43899,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44933,7 +43910,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44944,7 +43921,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44955,7 +43932,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44966,7 +43943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44977,7 +43954,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44988,7 +43965,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -44999,7 +43976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45010,7 +43987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45028,7 +44005,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45039,7 +44016,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45050,7 +44027,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45061,7 +44038,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45072,7 +44049,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45083,7 +44060,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45094,7 +44071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45105,7 +44082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45123,7 +44100,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45134,7 +44111,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45145,7 +44122,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45156,7 +44133,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45167,7 +44144,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45178,7 +44155,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45189,7 +44166,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -45207,7 +44184,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45225,7 +44202,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45254,7 +44231,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45290,7 +44267,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -45301,7 +44278,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -45319,7 +44296,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -45366,17 +44343,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -45386,7 +44352,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45404,8 +44370,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -45422,6 +44388,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -45436,11 +44438,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45454,7 +44456,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -45472,11 +44474,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45490,7 +44492,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -45508,29 +44510,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45544,11 +44528,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -45562,7 +44546,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -45613,7 +44597,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -45642,94 +44626,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45747,7 +44648,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45765,7 +44666,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45783,7 +44684,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45801,7 +44702,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45819,23 +44720,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -45848,8 +44738,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -45866,25 +44756,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45898,40 +44770,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45945,11 +44788,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -45963,7 +44806,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -46086,41 +44929,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -46138,7 +44955,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -46150,6 +44993,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -46157,8 +45019,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -46176,8 +45038,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -46195,8 +45057,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -46215,7 +45077,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -46234,7 +45096,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -46252,8 +45114,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -46262,7 +45124,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -46271,25 +45133,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -46297,26 +45140,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -46328,51 +45152,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -46380,8 +45159,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -46399,8 +45178,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -46413,133 +45192,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -46554,25 +45206,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -46590,7 +45224,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -46608,7 +45369,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -46626,11 +45387,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46644,11 +45405,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46662,7 +45423,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -46680,11 +45441,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46695,7 +45456,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46709,11 +45470,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -46727,7 +45488,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -46811,7 +45572,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -46862,7 +45623,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -46880,7 +45641,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -46898,7 +45659,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -46916,11 +45677,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -46938,7 +45699,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46949,7 +45710,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46960,7 +45721,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -46971,7 +45732,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47022,7 +45783,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47033,7 +45794,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47044,7 +45805,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47055,7 +45816,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47095,7 +45856,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47106,7 +45867,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47117,7 +45878,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47128,7 +45889,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47175,7 +45936,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47186,7 +45947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47226,7 +45987,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47237,7 +45998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47291,7 +46052,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47309,7 +46070,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47327,7 +46088,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47356,7 +46117,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47385,7 +46146,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -47396,7 +46157,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -47414,23 +46175,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -47443,10 +46204,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -47454,10 +46215,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -47472,7 +46251,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47483,7 +46313,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47494,7 +46324,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47505,7 +46335,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47516,7 +46346,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47527,7 +46357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47563,7 +46393,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -47581,74 +46411,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -47665,7 +46433,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -47674,6 +46442,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -47688,7 +46511,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 121,
+              "position_offset": 119,
               "field_name": "gtpu_ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47706,7 +46529,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 264,
+              "position_offset": 272,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47724,7 +46547,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 299,
+              "position_offset": 305,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47742,7 +46565,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "gtpu_ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47760,7 +46583,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 249,
+              "position_offset": 257,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47778,7 +46601,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 315,
               "field_name": "spgw_meta.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47796,6 +46619,71 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 47,
+              "field_lsb": 16,
+              "field_width": 6,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 7,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "ig_intr_md_from_prsr.global_tstamp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 6,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 8,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 232,
+              "field_name": "int_metadata.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 9,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 41,
               "field_name": "ethernet.src_addr",
               "field_msb": 15,
@@ -47821,11 +46709,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 7,
+          "phv_number": 10,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 386,
+              "position_offset": 392,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47836,7 +46724,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 378,
+              "position_offset": 384,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47847,7 +46735,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 390,
+              "position_offset": 396,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47858,7 +46746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 382,
+              "position_offset": 388,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -47872,99 +46760,12 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 11,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 369,
-              "field_name": "udp.len",
+              "position_offset": 141,
+              "field_name": "gtpu_udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -47974,8 +46775,8 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
+              "position_offset": 133,
+              "field_name": "gtpu_udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -47992,7 +46793,94 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 303,
+              "position_offset": 379,
+              "field_name": "udp.src_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 371,
+              "field_name": "udp.dst_port",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 13,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 137,
+              "field_name": "gtpu_udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 129,
+              "field_name": "gtpu_udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 14,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 375,
+              "field_name": "udp.len",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 16,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 367,
+              "field_name": "udp.checksum",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 15,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 309,
               "field_name": "spgw.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48006,11 +46894,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 13,
+          "phv_number": 32,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 278,
+              "position_offset": 286,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48021,7 +46909,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 282,
+              "position_offset": 290,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48032,7 +46920,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 274,
+              "position_offset": 282,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48043,7 +46931,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 286,
+              "position_offset": 294,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48057,7 +46945,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 14,
+          "phv_number": 33,
           "container_type": "normal",
           "records": [
             {
@@ -48075,7 +46963,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 15,
+          "phv_number": 34,
           "container_type": "normal",
           "records": [
             {
@@ -48093,29 +46981,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 36,
+          "phv_number": 35,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
+              "position_offset": 58,
               "field_name": "fabric_metadata.original_ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -48129,29 +46999,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 64,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "gtpu_ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48169,7 +47021,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 270,
+              "position_offset": 278,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48187,7 +47039,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 172,
+              "position_offset": 170,
               "field_name": "ig_intr_md_for_dprs.drop_ctl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48205,7 +47057,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "gtpu_ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48223,7 +47075,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 263,
+              "position_offset": 271,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -48290,7 +47142,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "gtpu",
                   "hidden": false
                 }
@@ -48309,7 +47161,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 103,
+                  "position_offset": 101,
                   "header_name": "gtpu_ipv4",
                   "hidden": false
                 }
@@ -48328,7 +47180,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 229,
+                  "position_offset": 237,
                   "header_name": "intl4_shim",
                   "hidden": false
                 }
@@ -48347,7 +47199,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 246,
+                  "position_offset": 254,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -48392,7 +47244,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 130,
+                  "position_offset": 128,
                   "header_name": "gtpu_udp",
                   "hidden": false
                 }
@@ -48411,7 +47263,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 149,
+                  "position_offset": 147,
                   "header_name": "icmp",
                   "hidden": false
                 }
@@ -48430,7 +47282,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 290,
+                  "position_offset": 298,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -48449,7 +47301,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 360,
+                  "position_offset": 366,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -48494,7 +47346,7 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 175,
+                  "position_offset": 179,
                   "header_name": "int_header",
                   "hidden": false
                 }
@@ -48513,7 +47365,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 273,
+                  "position_offset": 281,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -48532,7 +47384,7 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 315,
+                  "position_offset": 321,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -48551,7 +47403,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 377,
+                  "position_offset": 383,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -48565,7 +47417,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 291,
+              "position_offset": 299,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48583,7 +47435,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 173,
+              "position_offset": 171,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48601,61 +47453,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
+              "position_offset": 126,
               "field_name": "gtpu_ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48666,7 +47464,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "gtpu_ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48677,7 +47475,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "gtpu_ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48688,7 +47486,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "gtpu_ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48702,11 +47500,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 131,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 271,
+              "position_offset": 279,
               "field_name": "ipv4.version",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48717,7 +47515,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 269,
               "field_name": "ipv4.ihl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48728,7 +47526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 247,
+              "position_offset": 255,
               "field_name": "ipv4.dscp",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48739,7 +47537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 253,
+              "position_offset": 261,
               "field_name": "ipv4.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48753,11 +47551,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 132,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "gtpu_ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48768,7 +47566,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "gtpu_ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48782,11 +47580,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 133,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 263,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48797,7 +47595,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 257,
+              "position_offset": 265,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48811,12 +47609,66 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 134,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 114,
+              "field_name": "gtpu_ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 135,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 267,
+              "field_name": "ipv4.identification",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 136,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 123,
+              "field_name": "gtpu_ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 137,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
+              "position_offset": 276,
+              "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -48833,24 +47685,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 25,
               "field_name": "bridged_metadata.__pad_2",
               "field_msb": 15,
@@ -48862,7 +47696,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 295,
+              "position_offset": 303,
               "field_name": "spgw.do_spgw",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48884,7 +47718,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 293,
+              "position_offset": 301,
               "field_name": "spgw.direction",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48906,7 +47740,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 147,
+              "position_offset": 145,
               "field_name": "hasExited_0",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48917,7 +47751,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 307,
+              "position_offset": 313,
               "field_name": "spgw_ingress_hasReturned",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48931,7 +47765,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "container_type": "normal",
           "records": [
             {
@@ -48949,7 +47783,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 141,
+          "phv_number": 140,
           "container_type": "normal",
           "records": [
             {
@@ -48964,7 +47798,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 319,
               "field_name": "standard_metadata.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48975,7 +47809,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 64,
+              "position_offset": 62,
               "field_name": "fabric_metadata.pop_vlan_at_egress",
               "field_msb": 15,
               "field_lsb": 0,
@@ -48989,11 +47823,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 142,
+          "phv_number": 141,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 154,
+              "position_offset": 152,
               "field_name": "icmp.icmp_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49004,7 +47838,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 152,
+              "position_offset": 150,
               "field_name": "icmp.icmp_code",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49018,11 +47852,29 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 143,
+          "phv_number": 142,
           "container_type": "normal",
           "records": [
             {
               "position_offset": 54,
+              "field_name": "fabric_metadata.next_id",
+              "field_msb": 31,
+              "field_lsb": 16,
+              "field_width": 4,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 143,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 52,
               "field_name": "fabric_metadata.l4_src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49036,6 +47888,24 @@
           "word_bit_width": 16
         },
         {
+          "phv_number": 168,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 50,
+              "field_name": "fabric_metadata.l4_dst_port",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
           "phv_number": 256,
           "container_type": "normal",
           "records": [
@@ -49073,7 +47943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 99,
+              "position_offset": 97,
               "field_name": "gtpu.version",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49084,7 +47954,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 83,
+              "position_offset": 81,
               "field_name": "gtpu.pt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49095,7 +47965,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 91,
+              "position_offset": 89,
               "field_name": "gtpu.spare",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49106,7 +47976,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "gtpu.ex_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49117,7 +47987,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "gtpu.seq_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49128,7 +47998,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "gtpu.npdu_flag",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49139,7 +48009,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 75,
+              "position_offset": 73,
               "field_name": "gtpu.msgtype",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49150,7 +48020,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 71,
+              "position_offset": 69,
               "field_name": "gtpu.msglen",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49190,7 +48060,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 328,
+              "position_offset": 334,
               "field_name": "tcp.data_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49201,7 +48071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 340,
+              "position_offset": 346,
               "field_name": "tcp.res",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49212,7 +48082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 336,
+              "position_offset": 342,
               "field_name": "tcp.ecn",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49223,7 +48093,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 324,
+              "position_offset": 330,
               "field_name": "tcp.ctrl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49234,7 +48104,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 356,
+              "position_offset": 362,
               "field_name": "tcp.window",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49245,7 +48115,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 224,
+              "position_offset": 228,
               "field_name": "int_header.ver",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49256,7 +48126,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 208,
+              "position_offset": 212,
               "field_name": "int_header.rep",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49267,7 +48137,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 176,
+              "position_offset": 180,
               "field_name": "int_header.c",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49278,7 +48148,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 180,
+              "position_offset": 184,
               "field_name": "int_header.e",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49289,7 +48159,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 212,
+              "position_offset": 216,
               "field_name": "int_header.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49300,7 +48170,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 184,
+              "position_offset": 188,
               "field_name": "int_header.ins_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49311,7 +48181,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 204,
+              "position_offset": 208,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49322,7 +48192,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 220,
+              "position_offset": 224,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49333,7 +48203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 156,
+              "position_offset": 154,
               "field_name": "icmp.identifier",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49344,7 +48214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 160,
+              "position_offset": 158,
               "field_name": "icmp.sequence_number",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49362,7 +48232,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 348,
+              "position_offset": 354,
               "field_name": "tcp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49373,7 +48243,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 332,
+              "position_offset": 338,
               "field_name": "tcp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49384,7 +48254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 188,
+              "position_offset": 192,
               "field_name": "int_header.instruction_mask_0003",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49395,7 +48265,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 192,
+              "position_offset": 196,
               "field_name": "int_header.instruction_mask_0407",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49406,7 +48276,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 196,
+              "position_offset": 200,
               "field_name": "int_header.instruction_mask_0811",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49417,7 +48287,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 200,
+              "position_offset": 204,
               "field_name": "int_header.instruction_mask_1215",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49428,7 +48298,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 216,
+              "position_offset": 220,
               "field_name": "int_header.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49439,7 +48309,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49457,7 +48327,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 320,
+              "position_offset": 326,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49468,7 +48338,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 352,
+              "position_offset": 358,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49479,7 +48349,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 238,
               "field_name": "intl4_shim.int_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49490,7 +48360,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 238,
+              "position_offset": 246,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49501,7 +48371,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 234,
+              "position_offset": 242,
               "field_name": "intl4_shim.len",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49512,7 +48382,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 242,
+              "position_offset": 250,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49523,7 +48393,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 164,
+              "position_offset": 162,
               "field_name": "icmp.timestamp",
               "field_msb": 63,
               "field_lsb": 32,
@@ -49541,7 +48411,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 316,
+              "position_offset": 322,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49559,7 +48429,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "gtpu.teid",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49588,7 +48458,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 228,
+              "position_offset": 236,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -49624,7 +48494,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49635,7 +48505,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 150,
+              "position_offset": 148,
               "field_name": "icmp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -49653,7 +48523,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 350,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 16,
@@ -49700,17 +48570,6 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
             }
           ],
           "word_bit_width": 32
@@ -49720,7 +48579,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 157,
+              "position_offset": 146,
               "field_name": "int_egress_tstamp.egress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49738,8 +48597,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
+              "position_offset": 180,
+              "field_name": "int_metadata.ingress_tstamp",
               "field_msb": 31,
               "field_lsb": 0,
               "field_width": 4,
@@ -49756,6 +48615,42 @@
           "container_type": "normal",
           "records": [
             {
+              "position_offset": 176,
+              "field_name": "int_ingress_tstamp.ingress_tstamp",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 21,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 283,
+              "field_name": "spgw.teid",
+              "field_msb": 31,
+              "field_lsb": 0,
+              "field_width": 4,
+              "phv_msb": 31,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 32
+        },
+        {
+          "phv_number": 22,
+          "container_type": "normal",
+          "records": [
+            {
               "position_offset": 64,
               "field_name": "gtpu.teid",
               "field_msb": 31,
@@ -49770,11 +48665,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 21,
+          "phv_number": 23,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 296,
+              "position_offset": 279,
               "field_name": "spgw.s1u_sgw_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49788,7 +48683,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 22,
+          "phv_number": 24,
           "container_type": "normal",
           "records": [
             {
@@ -49806,11 +48701,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 23,
+          "phv_number": 25,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 292,
+              "position_offset": 275,
               "field_name": "spgw.s1u_enb_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49824,7 +48719,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 24,
+          "phv_number": 26,
           "container_type": "normal",
           "records": [
             {
@@ -49842,29 +48737,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 25,
+          "phv_number": 27,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
+              "position_offset": 203,
               "field_name": "int_switch_id.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49878,11 +48755,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 27,
+          "phv_number": 28,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 198,
+              "position_offset": 188,
               "field_name": "int_metadata.switch_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -49896,7 +48773,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 28,
+          "phv_number": 29,
           "container_type": "normal",
           "records": [
             {
@@ -49947,7 +48824,7 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 29,
+          "phv_number": 30,
           "container_type": "normal",
           "records": [
             {
@@ -49976,94 +48853,11 @@
           "word_bit_width": 32
         },
         {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
           "phv_number": 80,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 194,
+              "position_offset": 184,
               "field_name": "int_metadata.ins_cnt_tmp",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50081,7 +48875,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 197,
+              "position_offset": 187,
               "field_name": "int_metadata.int_hdr_word_len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50099,7 +48893,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 229,
+              "position_offset": 210,
               "field_name": "intl4_shim.len",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50117,7 +48911,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 181,
+              "position_offset": 172,
               "field_name": "int_header.total_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50135,7 +48929,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 174,
+              "position_offset": 165,
               "field_name": "int_header.max_hop_cnt",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50153,23 +48947,12 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
+              "position_offset": 21,
+              "field_name": "eg_intr_md.deq_qdepth",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
+              "field_width": 3,
               "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -50182,8 +48965,8 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
+              "position_offset": 199,
+              "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 3,
@@ -50200,25 +48983,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
+              "position_offset": 198,
               "field_name": "int_q_occupancy.q_id",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50232,40 +48997,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 89,
+          "phv_number": 88,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
+              "position_offset": 274,
               "field_name": "spgw.do_spgw",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50279,11 +49015,11 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 91,
+          "phv_number": 89,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 288,
+              "position_offset": 273,
               "field_name": "spgw.direction",
               "field_msb": 7,
               "field_lsb": 0,
@@ -50297,7 +49033,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 92,
+          "phv_number": 90,
           "container_type": "normal",
           "records": [
             {
@@ -50420,41 +49156,15 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
+              "phv_msb": 7,
+              "phv_lsb": 7,
               "is_compiler_generated": false,
               "is_pov": true,
               "pov_headers": [
                 {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
+                  "bit_index": 7,
+                  "position_offset": 251,
+                  "header_name": "mpls",
                   "hidden": false
                 }
               ]
@@ -50472,7 +49182,33 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 156,
+                  "position_offset": 268,
+                  "header_name": "packet_in",
+                  "hidden": false
+                }
+              ]
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 91,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
+              "phv_msb": 0,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 0,
+                  "position_offset": 145,
                   "header_name": "int_egress_tstamp",
                   "hidden": false
                 }
@@ -50484,6 +49220,25 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
+              "phv_msb": 1,
+              "phv_lsb": 1,
+              "is_compiler_generated": false,
+              "is_pov": true,
+              "pov_headers": [
+                {
+                  "bit_index": 1,
+                  "position_offset": 150,
+                  "header_name": "int_header",
+                  "hidden": false
+                }
+              ]
+            },
+            {
+              "position_offset": 0,
+              "field_name": "POV",
+              "field_msb": 7,
+              "field_lsb": 0,
+              "field_width": 0,
               "phv_msb": 2,
               "phv_lsb": 2,
               "is_compiler_generated": false,
@@ -50491,8 +49246,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
+                  "position_offset": 175,
+                  "header_name": "int_ingress_tstamp",
                   "hidden": false
                 }
               ]
@@ -50510,8 +49265,8 @@
               "pov_headers": [
                 {
                   "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
+                  "position_offset": 192,
+                  "header_name": "int_port_ids",
                   "hidden": false
                 }
               ]
@@ -50529,8 +49284,8 @@
               "pov_headers": [
                 {
                   "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
+                  "position_offset": 197,
+                  "header_name": "int_q_occupancy",
                   "hidden": false
                 }
               ]
@@ -50549,7 +49304,7 @@
                 {
                   "bit_index": 5,
                   "position_offset": 202,
-                  "header_name": "int_port_ids",
+                  "header_name": "int_switch_id",
                   "hidden": false
                 }
               ]
@@ -50568,7 +49323,7 @@
                 {
                   "bit_index": 6,
                   "position_offset": 207,
-                  "header_name": "int_q_congestion",
+                  "header_name": "intl4_shim",
                   "hidden": false
                 }
               ]
@@ -50586,8 +49341,8 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
+                  "position_offset": 214,
+                  "header_name": "ipv4",
                   "hidden": false
                 }
               ]
@@ -50596,7 +49351,7 @@
           "word_bit_width": 8
         },
         {
-          "phv_number": 94,
+          "phv_number": 92,
           "container_type": "normal",
           "records": [
             {
@@ -50605,25 +49360,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 0,
               "phv_lsb": 0,
               "is_compiler_generated": false,
@@ -50631,26 +49367,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
+                  "position_offset": 287,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -50662,51 +49379,6 @@
               "field_msb": 7,
               "field_lsb": 0,
               "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
               "phv_msb": 1,
               "phv_lsb": 1,
               "is_compiler_generated": false,
@@ -50714,8 +49386,8 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
+                  "position_offset": 318,
+                  "header_name": "udp",
                   "hidden": false
                 }
               ]
@@ -50733,8 +49405,8 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
+                  "position_offset": 331,
+                  "header_name": "vlan_tag",
                   "hidden": false
                 }
               ]
@@ -50747,133 +49419,6 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
               "position_offset": 114,
               "field_name": "gtpu_udp.len",
               "field_msb": 15,
@@ -50888,25 +49433,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
+          "phv_number": 145,
           "container_type": "normal",
           "records": [
             {
@@ -50924,7 +49451,134 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 151,
+          "phv_number": 146,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 325,
+              "field_name": "udp.len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 147,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 185,
+              "field_name": "int_metadata.insert_byte_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 148,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 173,
+              "field_name": "int_header.ver",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 166,
+              "field_name": "int_header.rep",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 10,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 151,
+              "field_name": "int_header.c",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 9,
+              "phv_lsb": 9,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 153,
+              "field_name": "int_header.e",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 8,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 168,
+              "field_name": "int_header.rsvd1",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 5,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 155,
+              "field_name": "int_header.ins_cnt",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 4,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 149,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 243,
+              "field_name": "ipv4.total_len",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 150,
           "container_type": "normal",
           "records": [
             {
@@ -50942,7 +49596,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 152,
+          "phv_number": 151,
           "container_type": "normal",
           "records": [
             {
@@ -50960,11 +49614,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 153,
+          "phv_number": 152,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 203,
+              "position_offset": 193,
               "field_name": "int_port_ids.egress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -50978,11 +49632,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 154,
+          "phv_number": 153,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 205,
+              "position_offset": 195,
               "field_name": "int_port_ids.ingress_port_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -50996,7 +49650,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 155,
+          "phv_number": 154,
           "container_type": "normal",
           "records": [
             {
@@ -51014,11 +49668,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 156,
+          "phv_number": 155,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 286,
+              "position_offset": 271,
               "field_name": "packet_in.ingress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51029,7 +49683,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 284,
+              "position_offset": 269,
               "field_name": "packet_in._pad",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51043,11 +49697,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 157,
+          "phv_number": 156,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 336,
+              "position_offset": 319,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51061,7 +49715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 158,
+          "phv_number": 157,
           "container_type": "normal",
           "records": [
             {
@@ -51145,7 +49799,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 159,
+          "phv_number": 158,
           "container_type": "normal",
           "records": [
             {
@@ -51196,7 +49850,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 160,
+          "phv_number": 159,
           "container_type": "normal",
           "records": [
             {
@@ -51214,7 +49868,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 161,
+          "phv_number": 160,
           "container_type": "normal",
           "records": [
             {
@@ -51232,7 +49886,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 162,
+          "phv_number": 161,
           "container_type": "normal",
           "records": [
             {
@@ -51250,11 +49904,11 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 163,
+          "phv_number": 162,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 218,
+              "position_offset": 199,
               "field_name": "int_q_occupancy.q_occupancy",
               "field_msb": 23,
               "field_lsb": 8,
@@ -51272,7 +49926,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 357,
+              "position_offset": 340,
               "field_name": "vlan_tag.pri",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51283,7 +49937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 349,
+              "position_offset": 332,
               "field_name": "vlan_tag.cfi",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51294,7 +49948,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 361,
+              "position_offset": 344,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51305,7 +49959,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 353,
+              "position_offset": 336,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51356,7 +50010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 240,
+              "position_offset": 223,
               "field_name": "ipv4.flags",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51367,7 +50021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 244,
+              "position_offset": 227,
               "field_name": "ipv4.frag_offset",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51378,7 +50032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 261,
+              "position_offset": 245,
               "field_name": "ipv4.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51389,7 +50043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 251,
+              "position_offset": 235,
               "field_name": "ipv4.protocol",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51429,7 +50083,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 271,
+              "position_offset": 256,
               "field_name": "mpls.label",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51440,7 +50094,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 275,
+              "position_offset": 260,
               "field_name": "mpls.tc",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51451,7 +50105,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 267,
+              "position_offset": 252,
               "field_name": "mpls.bos",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51462,7 +50116,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 279,
+              "position_offset": 264,
               "field_name": "mpls.ttl",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51509,7 +50163,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 309,
+              "position_offset": 292,
               "field_name": "tcp.checksum",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51520,7 +50174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 329,
+              "position_offset": 312,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51560,7 +50214,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 344,
+              "position_offset": 327,
               "field_name": "udp.src_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51571,7 +50225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 338,
+              "position_offset": 321,
               "field_name": "udp.dst_port",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51625,7 +50279,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 255,
+              "position_offset": 239,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51643,7 +50297,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 235,
+              "position_offset": 217,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51661,7 +50315,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 323,
+              "position_offset": 306,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51690,7 +50344,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 305,
+              "position_offset": 288,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -51719,7 +50373,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
+              "position_offset": 316,
               "field_name": "tcp.window",
               "field_msb": 7,
               "field_lsb": 0,
@@ -51730,7 +50384,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 232,
+              "position_offset": 213,
               "field_name": "intl4_shim.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
@@ -51748,23 +50402,23 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
+              "position_offset": 316,
+              "field_name": "tcp.window",
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
               "phv_msb": 7,
-              "phv_lsb": 4,
+              "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
             },
             {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
+              "position_offset": 170,
+              "field_name": "int_header.rsvd2",
               "field_msb": 7,
               "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
+              "field_width": 2,
+              "phv_msb": 7,
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
@@ -51777,10 +50431,10 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 7,
+              "field_lsb": 0,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -51788,10 +50442,28 @@
               "is_pov": false
             },
             {
-              "position_offset": 179,
+              "position_offset": 170,
               "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
+              "field_msb": 15,
+              "field_lsb": 8,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 8
+        },
+        {
+          "phv_number": 295,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 300,
+              "field_name": "tcp.dst_port",
+              "field_msb": 15,
+              "field_lsb": 8,
               "field_width": 2,
               "phv_msb": 7,
               "phv_lsb": 0,
@@ -51806,7 +50478,58 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 315,
+              "position_offset": 249,
+              "field_name": "ipv4.version",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 233,
+              "field_name": "ipv4.ihl",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 215,
+              "field_name": "ipv4.dscp",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 2,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 221,
+              "field_name": "ipv4.ecn",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 1,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            }
+          ],
+          "word_bit_width": 16
+        },
+        {
+          "phv_number": 327,
+          "container_type": "normal",
+          "records": [
+            {
+              "position_offset": 298,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51817,7 +50540,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 321,
+              "position_offset": 304,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51828,7 +50551,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 319,
+              "position_offset": 302,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51839,7 +50562,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 313,
+              "position_offset": 296,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51850,7 +50573,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 227,
+              "position_offset": 208,
               "field_name": "intl4_shim.int_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51861,7 +50584,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 230,
+              "position_offset": 211,
               "field_name": "intl4_shim.rsvd1",
               "field_msb": 15,
               "field_lsb": 0,
@@ -51897,7 +50620,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 327,
+          "phv_number": 328,
           "container_type": "normal",
           "records": [
             {
@@ -51915,74 +50638,12 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
           "phv_number": 329,
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
+              "position_offset": 231,
+              "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
               "field_width": 2,
@@ -51999,7 +50660,7 @@
           "container_type": "normal",
           "records": [
             {
-              "position_offset": 327,
+              "position_offset": 310,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -52008,6 +50669,61 @@
               "phv_lsb": 0,
               "is_compiler_generated": false,
               "is_pov": false
+            },
+            {
+              "position_offset": 157,
+              "field_name": "int_header.instruction_mask_0003",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 12,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 159,
+              "field_name": "int_header.instruction_mask_0407",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 11,
+              "phv_lsb": 8,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 161,
+              "field_name": "int_header.instruction_mask_0811",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 7,
+              "phv_lsb": 4,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 163,
+              "field_name": "int_header.instruction_mask_1215",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 3,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
+            },
+            {
+              "position_offset": 121,
+              "field_name": "icmp.checksum",
+              "field_msb": 15,
+              "field_lsb": 0,
+              "field_width": 2,
+              "phv_msb": 15,
+              "phv_lsb": 0,
+              "is_compiler_generated": false,
+              "is_pov": false
             }
           ],
           "word_bit_width": 16
@@ -52047,7 +50763,7 @@
               {
                 "action_name": "act_0",
                 "action_handle": 536870914,
-                "table_name": "tbl_act_17",
+                "table_name": "tbl_act_15",
                 "next_table": 0,
                 "next_table_full": 16,
                 "vliw_instruction": 1,
@@ -52086,7 +50802,15 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W8" },
+              "src": [
+                { "type": "phv", "name": "W6" },
+                { "type": "phv", "name": "W7" }
               ]
             }
           ]
@@ -52109,7 +50833,7 @@
     {
       "direction": "egress",
       "handle": 16777218,
-      "name": "tbl_act_14",
+      "name": "tbl_act_13",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -52168,7 +50892,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 3 ],
+            "result_physical_buses": [ 2 ],
             "ternary_indirection_stage_table": {
               "stage_number": 0,
               "stage_table_type": "ternary_indirection",
@@ -52586,9 +51310,9 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "act_14",
+                  "action_name": "act_13",
                   "action_handle": 536870915,
-                  "table_name": "tbl_act_32",
+                  "table_name": "cond-19",
                   "next_table": 0,
                   "next_table_full": 2,
                   "vliw_instruction": 0,
@@ -52633,7 +51357,7 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "act_14",
+          "name": "act_13",
           "handle": 536870915,
           "indirect_resources": [],
           "allowed_as_default_action": true,
@@ -52653,10 +51377,10 @@
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
+              "dst": { "type": "phv", "name": "B26" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B28" }
+                { "type": "phv", "name": "B26" }
               ]
             }
           ]
@@ -52673,95 +51397,6 @@
     {
       "direction": "egress",
       "handle": 16777219,
-      "name": "tbl_act_15",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_15",
-                "action_handle": 536870916,
-                "table_name": "cond-20",
-                "next_table": 0,
-                "next_table_full": 3,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_15",
-          "handle": 536870916,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.dscp" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B21" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870916,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777220,
       "name": "tbl_int_egress_int_hop_cnt_increment",
       "table_type": "match",
       "size": 1,
@@ -52772,7 +51407,7 @@
             "stage_number": 0,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 4,
+            "logical_table_id": 3,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -52788,12 +51423,12 @@
             "action_format": [
               {
                 "action_name": "int_egress.int_hop_cnt_increment",
-                "action_handle": 536870917,
+                "action_handle": 536870916,
                 "table_name": "tbl_int_egress_int_hop_cnt_exceeded_0",
                 "next_table": 0,
-                "next_table_full": 7,
+                "next_table_full": 6,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
+                "vliw_instruction_full": 65,
                 "immediate_fields": []
               }
             ],
@@ -52806,7 +51441,7 @@
       "actions": [
         {
           "name": "int_egress.int_hop_cnt_increment",
-          "handle": 536870917,
+          "handle": 536870916,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -52835,6 +51470,109 @@
           ]
         }
       ],
+      "default_action_handle": 536870916,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": [],
+      "performs_hash_action": false,
+      "action_data_table_refs": [],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": []
+    },
+    {
+      "direction": "egress",
+      "handle": 16777220,
+      "name": "tbl_int_egress_int_transit",
+      "table_type": "match",
+      "size": 1,
+      "preferred_match_type": "exact",
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 0,
+            "size": 1,
+            "stage_table_type": "match_with_no_key",
+            "logical_table_id": 4,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "memory_resource_allocation": null,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 0,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0
+              }
+            ],
+            "result_physical_buses": [ 2 ],
+            "action_format": [
+              {
+                "action_name": "int_egress.int_transit",
+                "action_handle": 536870917,
+                "table_name": "tbl_int_egress_int_metadata_insert_int_set_header_0407_i12_0",
+                "next_table": 0,
+                "next_table_full": 5,
+                "vliw_instruction": 1,
+                "vliw_instruction_full": 66,
+                "immediate_fields": []
+              }
+            ],
+            "hash_functions": []
+          }
+        ],
+        "match_type": "match_with_no_key",
+        "uses_dynamic_key_masks": false
+      },
+      "actions": [
+        {
+          "name": "int_egress.int_transit",
+          "handle": 536870917,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
+              "src": [ { "immediate": "200" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operator": "shl",
+              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
+              "src": [
+                { "type": "phv", "name": "H20" },
+                { "type": "phv", "name": "H20" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B17" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "B16" }
+              ]
+            }
+          ]
+        }
+      ],
       "default_action_handle": 536870917,
       "action_profile": "",
       "default_next_table_mask": 0,
@@ -52852,7 +51590,7 @@
     {
       "direction": "egress",
       "handle": 16777221,
-      "name": "int_egress.int_prep",
+      "name": "tbl_int_egress_int_metadata_insert_int_set_header_0407_i12",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -52862,7 +51600,7 @@
             "size": 512,
             "stage_table_type": "ternary_match",
             "logical_table_id": 5,
-            "default_next_table": 6,
+            "default_next_table": 1,
             "has_attached_gateway": false,
             "pack_format": [
               {
@@ -52911,7 +51649,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "ternary_indirection_stage_table": {
               "stage_number": 0,
               "stage_table_type": "ternary_indirection",
@@ -52920,41 +51658,181 @@
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 8,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 123,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 107,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 91,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 64,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 75,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 59,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 11,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 5,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 43,
+                          "field_name": "--padding_11_15--"
+                        }
+                      ]
+                    },
+                    {
                       "entry_number": 1,
                       "fields": [
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 11,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 65,
+                          "lsb_mem_word_offset": 16,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 31,
+                          "field_width": 5,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "--padding_33_63--"
+                          "lsb_mem_word_offset": 27,
+                          "field_name": "--padding_11_15--"
                         }
                       ]
                     },
@@ -52964,32 +51842,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 11,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 1,
+                          "lsb_mem_word_offset": 0,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 31,
+                          "field_width": 5,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "--padding_33_63--"
+                          "lsb_mem_word_offset": 11,
+                          "field_name": "--padding_11_15--"
                         }
                       ]
                     }
@@ -52999,30 +51867,37 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "NoAction",
-                  "action_handle": 536870919,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
-                  "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 68,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "int_egress.int_transit",
+                  "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
                   "action_handle": 536870918,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
+                  "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
                   "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 1,
+                  "next_table_full": 17,
+                  "vliw_instruction": 0,
                   "vliw_instruction_full": 67,
                   "immediate_fields": [
                     {
-                      "param_name": "switch_id",
-                      "param_type": "parameter",
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
                       "param_shift": 0,
                       "dest_start": 0,
-                      "dest_width": 32
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 2,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_5",
+                      "param_type": "constant",
+                      "const_value": 5,
+                      "param_shift": 0,
+                      "dest_start": 8,
+                      "dest_width": 3
                     }
                   ]
                 }
@@ -53039,8 +51914,8 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "NoAction",
-          "handle": 536870919,
+          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
+          "handle": 536870918,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -53056,60 +51931,33 @@
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
           "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_transit",
-          "handle": 536870918,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "switch_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
-              "src": [ { "type": "immediate", "name": "switch_id" } ]
+              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
+              "src": [ { "type": "phv", "name": "W19" } ]
             },
             {
               "name": "DirectAluPrimitive",
-              "operator": "shl",
-              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
+              "operation": "bitmasked-set",
+              "dst": { "type": "phv", "name": "B27" },
               "src": [
-                { "type": "phv", "name": "H18" },
-                { "type": "phv", "name": "H18" }
+                { "type": "immediate", "name": "$data0" },
+                { "type": "phv", "name": "B27" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B17" },
+              "dst": { "type": "phv", "name": "W18" },
               "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "B16" }
+                { "type": "phv", "name": "W16" },
+                { "type": "phv", "name": "W17" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870919,
+      "default_action_handle": 536870918,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -53120,4117 +51968,6 @@
     {
       "direction": "egress",
       "handle": 16777222,
-      "name": "int_egress.int_metadata_insert.int_inst_0407",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554433,
-          "name": "int_egress_int_metadata_insert_int_inst_0$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870920,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0407",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0407"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 6,
-            "default_next_table": 17,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-                "action_handle": 536870920,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-                "action_handle": 536870921,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-                "action_handle": 536870922,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-                "action_handle": 536870923,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_65",
-                    "param_type": "constant",
-                    "const_value": 65,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-                "action_handle": 536870924,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-                "action_handle": 536870925,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-                "action_handle": 536870926,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_66",
-                    "param_type": "constant",
-                    "const_value": 66,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-                "action_handle": 536870927,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_67",
-                    "param_type": "constant",
-                    "const_value": 67,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-                "action_handle": 536870928,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-                "action_handle": 536870929,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-                "action_handle": 536870930,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_80",
-                    "param_type": "constant",
-                    "const_value": 80,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-                "action_handle": 536870931,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_81",
-                    "param_type": "constant",
-                    "const_value": 81,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-                "action_handle": 536870932,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-                "action_handle": 536870933,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-                "action_handle": 536870934,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_82",
-                    "param_type": "constant",
-                    "const_value": 82,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-                "action_handle": 536870935,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 32,
-                "vliw_instruction_full": 96,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_83",
-                    "param_type": "constant",
-                    "const_value": 83,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 0,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 15,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 91,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 21,
-                            "field_name": "--padding_21_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 33554433,
-      "name": "int_egress_int_metadata_insert_int_inst_0$action",
-      "table_type": "action",
-      "size": 4096,
-      "stage_tables": [
-        {
-          "stage_number": 0,
-          "size": 4096,
-          "stage_table_type": "action_data",
-          "logical_table_id": 6,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870920
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870921
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870922
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870923
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870924
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870925
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870926
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870927
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870928
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870929
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870930
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870931
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870932
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870933
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870934
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870935
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777223,
       "name": "tbl_int_egress_int_hop_cnt_exceeded",
       "table_type": "match",
       "size": 1,
@@ -57241,7 +51978,7 @@
             "stage_number": 0,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 7,
+            "logical_table_id": 6,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57257,12 +51994,12 @@
             "action_format": [
               {
                 "action_name": "int_egress.int_hop_cnt_exceeded",
-                "action_handle": 536870936,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
+                "action_handle": 536870919,
+                "table_name": "tbl_act_27",
                 "next_table": 0,
                 "next_table_full": 21,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 71,
+                "vliw_instruction_full": 68,
                 "immediate_fields": []
               }
             ],
@@ -57275,7 +52012,7 @@
       "actions": [
         {
           "name": "int_egress.int_hop_cnt_exceeded",
-          "handle": 536870936,
+          "handle": 536870919,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57297,13 +52034,13 @@
               "dst": { "type": "phv", "name": "int_header.e" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H18" }
+                { "type": "phv", "name": "H20" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870936,
+      "default_action_handle": 536870919,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57319,7 +52056,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777224,
+      "handle": 16777223,
       "name": "tbl_act_0",
       "table_type": "match",
       "size": 1,
@@ -57346,8 +52083,8 @@
             "action_format": [
               {
                 "action_name": "act",
-                "action_handle": 536870937,
-                "table_name": "tbl_act_18",
+                "action_handle": 536870920,
+                "table_name": "tbl_act_16",
                 "next_table": 0,
                 "next_table_full": 32,
                 "vliw_instruction": 1,
@@ -57364,7 +52101,7 @@
       "actions": [
         {
           "name": "act",
-          "handle": 536870937,
+          "handle": 536870920,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57394,13 +52131,103 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870937,
+      "default_action_handle": 536870920,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": [],
+      "performs_hash_action": false,
+      "action_data_table_refs": [],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": []
+    },
+    {
+      "direction": "egress",
+      "handle": 16777224,
+      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
+      "table_type": "match",
+      "size": 1,
+      "preferred_match_type": "exact",
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 1,
+            "size": 1,
+            "stage_table_type": "match_with_no_key",
+            "logical_table_id": 1,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "memory_resource_allocation": null,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 0,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0
+              }
+            ],
+            "result_physical_buses": [ 2 ],
+            "action_format": [
+              {
+                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
+                "action_handle": 536870921,
+                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
+                "next_table": 0,
+                "next_table_full": 18,
+                "vliw_instruction": 1,
+                "vliw_instruction_full": 64,
+                "immediate_fields": []
+              }
+            ],
+            "hash_functions": []
+          }
+        ],
+        "match_type": "match_with_no_key",
+        "uses_dynamic_key_masks": false
+      },
+      "actions": [
+        {
+          "name": "int_egress.int_outer_encap.int_update_ipv4",
+          "handle": 536870921,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "ipv4.total_len" },
+              "src": [
+                { "type": "phv", "name": "H21" },
+                { "type": "phv", "name": "H19" }
+              ]
+            }
+          ]
+        }
+      ],
+      "default_action_handle": 536870921,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57427,7 +52254,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
+            "logical_table_id": 2,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57439,16 +52266,16 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
                 "action_name": "int_egress.int_outer_encap.int_update_shim",
-                "action_handle": 536870938,
+                "action_handle": 536870922,
                 "table_name": "tbl_int_egress_int_outer_encap_int_update_udp_0",
                 "next_table": 0,
-                "next_table_full": 18,
+                "next_table_full": 19,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
+                "vliw_instruction_full": 65,
                 "immediate_fields": []
               }
             ],
@@ -57461,7 +52288,7 @@
       "actions": [
         {
           "name": "int_egress.int_outer_encap.int_update_shim",
-          "handle": 536870938,
+          "handle": 536870922,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57490,7 +52317,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870938,
+      "default_action_handle": 536870922,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57517,7 +52344,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
+            "logical_table_id": 3,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -57529,16 +52356,16 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 1 ],
+            "result_physical_buses": [ 0 ],
             "action_format": [
               {
                 "action_name": "int_egress.int_outer_encap.int_update_udp",
-                "action_handle": 536870939,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
+                "action_handle": 536870923,
+                "table_name": "tbl_int_egress_int_metadata_insert_int_set_header_0003_i13_0",
                 "next_table": 0,
-                "next_table_full": 19,
+                "next_table_full": 20,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
+                "vliw_instruction_full": 66,
                 "immediate_fields": []
               }
             ],
@@ -57551,7 +52378,7 @@
       "actions": [
         {
           "name": "int_egress.int_outer_encap.int_update_udp",
-          "handle": 536870939,
+          "handle": 536870923,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -57573,8 +52400,8 @@
               "operation": "add",
               "dst": { "type": "phv", "name": "udp.len" },
               "src": [
-                { "type": "phv", "name": "H16" },
-                { "type": "phv", "name": "H17" }
+                { "type": "phv", "name": "H18" },
+                { "type": "phv", "name": "H19" }
               ]
             },
             {
@@ -57585,7 +52412,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870939,
+      "default_action_handle": 536870923,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -57602,1530 +52429,7 @@
     {
       "direction": "egress",
       "handle": 16777227,
-      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 3,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
-                "action_handle": 536870940,
-                "table_name": "int_egress_int_metadata_insert_int_inst",
-                "next_table": 0,
-                "next_table_full": 20,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_outer_encap.int_update_ipv4",
-          "handle": 536870940,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [
-                { "type": "phv", "name": "H19" },
-                { "type": "phv", "name": "H17" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870940,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777228,
-      "name": "int_egress.int_metadata_insert.int_inst_0003",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870941,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0003",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0003"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 21,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-                "action_handle": 536870941,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 3,
-                "vliw_instruction_full": 67,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-                "action_handle": 536870942,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-                "action_handle": 536870949,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-                "action_handle": 536870943,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-                "action_handle": 536870944,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-                "action_handle": 536870945,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-                "action_handle": 536870946,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-                "action_handle": 536870947,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-                "action_handle": 536870948,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-                "action_handle": 536870950,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-                "action_handle": 536870951,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-                "action_handle": 536870952,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-                "action_handle": 536870953,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-                "action_handle": 536870954,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-                "action_handle": 536870955,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-                "action_handle": 536870956,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 1,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 16,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 90,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 22,
-                            "field_name": "--padding_22_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-          "handle": 536870941,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-          "handle": 536870942,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-          "handle": 536870949,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-          "handle": 536870943,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-          "handle": 536870944,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-          "handle": 536870945,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-          "handle": 536870946,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-          "handle": 536870947,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-          "handle": 536870948,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-          "handle": 536870950,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-          "handle": 536870951,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-          "handle": 536870952,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-          "handle": 536870953,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-          "handle": 536870954,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-          "handle": 536870955,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-          "handle": 536870956,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 16777229,
-      "name": "tbl_spgw_egress_gtpu_encap",
+      "name": "tbl_int_egress_int_metadata_insert_int_set_header_0003_i13",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -59134,9 +52438,9 @@
             "stage_number": 1,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 5,
-            "default_next_table": 6,
-            "has_attached_gateway": true,
+            "logical_table_id": 4,
+            "default_next_table": 5,
+            "has_attached_gateway": false,
             "pack_format": [
               {
                 "table_word_width": 0,
@@ -59202,32 +52506,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 121,
+                          "lsb_mem_word_offset": 120,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 127,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59237,32 +52531,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 113,
+                          "lsb_mem_word_offset": 112,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 119,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59272,32 +52556,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 105,
+                          "lsb_mem_word_offset": 104,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 111,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59307,32 +52581,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 97,
+                          "lsb_mem_word_offset": 96,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 103,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59342,32 +52606,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 89,
+                          "lsb_mem_word_offset": 88,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 95,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59377,32 +52631,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 81,
+                          "lsb_mem_word_offset": 80,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 87,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59412,32 +52656,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 73,
+                          "lsb_mem_word_offset": 72,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 79,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59447,32 +52681,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 65,
+                          "lsb_mem_word_offset": 64,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 71,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59482,32 +52706,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 57,
+                          "lsb_mem_word_offset": 56,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 63,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59517,32 +52731,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 49,
+                          "lsb_mem_word_offset": 48,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 55,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59552,32 +52756,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 41,
+                          "lsb_mem_word_offset": 40,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 47,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59587,32 +52781,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 33,
+                          "lsb_mem_word_offset": 32,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 39,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59622,32 +52806,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 25,
+                          "lsb_mem_word_offset": 24,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 31,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59657,32 +52831,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 17,
+                          "lsb_mem_word_offset": 16,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 23,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59692,32 +52856,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 9,
+                          "lsb_mem_word_offset": 8,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 15,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     },
@@ -59727,32 +52881,22 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
                           "field_width": 6,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "immediate",
-                          "lsb_mem_word_offset": 1,
+                          "lsb_mem_word_offset": 0,
                           "field_name": "immediate"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 1,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 7,
-                          "field_name": "--padding_7_7--"
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_6_7--"
                         }
                       ]
                     }
@@ -59762,13 +52906,13 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "spgw_egress.gtpu_encap",
-                  "action_handle": 536870957,
-                  "table_name": "tbl_act_30",
+                  "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
+                  "action_handle": 536870924,
+                  "table_name": "tbl_act_27",
                   "next_table": 0,
-                  "next_table_full": 22,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 71,
+                  "next_table_full": 21,
+                  "vliw_instruction": 0,
+                  "vliw_instruction_full": 67,
                   "immediate_fields": [
                     {
                       "param_name": "constant_1",
@@ -59783,7 +52927,7 @@
                       "param_type": "constant",
                       "const_value": 1,
                       "param_shift": 0,
-                      "dest_start": 5,
+                      "dest_start": 3,
                       "dest_width": 1
                     },
                     {
@@ -59791,7 +52935,7 @@
                       "param_type": "constant",
                       "const_value": 1,
                       "param_shift": 0,
-                      "dest_start": 3,
+                      "dest_start": 5,
                       "dest_width": 1
                     }
                   ]
@@ -59802,21 +52946,15 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554434,
-          "name": "tbl_spgw_egress_gtpu_encap_0$action"
-        }
-      ],
+      "action_data_table_refs": [],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
+          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
+          "handle": 536870924,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -59831,87 +52969,59 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
+          "is_action_meter_color_aware": false,
           "primitives": [
             {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
               "src": [ { "type": "immediate", "name": "0" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
+              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
+              "src": [ { "type": "phv", "name": "W28" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
+              "src": [ { "type": "phv", "name": "B21" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
+              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
               "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
+                { "type": "phv", "name": "H33" },
+                { "type": "phv", "name": "H34" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
+              "dst": { "type": "phv", "name": "B27" },
+              "src": [
+                { "type": "immediate", "name": "$data0" },
+                { "type": "phv", "name": "B27" }
+              ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
+              "dst": { "type": "phv", "name": "H24" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "H23" }
+              ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
+              "dst": { "type": "phv", "name": "H25" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "H26" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870957,
+      "default_action_handle": 536870924,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -59921,334 +53031,8 @@
     },
     {
       "direction": "egress",
-      "handle": 33554434,
-      "name": "tbl_spgw_egress_gtpu_encap_0$action",
-      "table_type": "action",
-      "size": 1024,
-      "stage_tables": [
-        {
-          "stage_number": 1,
-          "size": 1024,
-          "stage_table_type": "action_data",
-          "logical_table_id": 5,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$constant10"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant11"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 45,
-                      "field_name": "$constant5"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 44,
-                      "field_name": "$constant6"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 43,
-                      "field_name": "$constant7"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 42,
-                      "field_name": "$constant8"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "$constant9"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 60,
-                      "field_name": "$constant12"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant13"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 6,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
-                      "lsb_mem_word_offset": 50,
-                      "field_name": "$constant14"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "$constant15"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 93,
-                      "field_name": "$constant16"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 13,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "$constant17"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$constant18"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant19"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "$constant20"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant21"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870957
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
-              "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777230,
-      "name": "tbl_act_13",
+      "handle": 16777228,
+      "name": "tbl_act_12",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -60258,7 +53042,7 @@
             "stage_number": 1,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
+            "logical_table_id": 5,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -60273,13 +53057,13 @@
             "result_physical_buses": [ 4 ],
             "action_format": [
               {
-                "action_name": "act_13",
-                "action_handle": 536870958,
-                "table_name": "--END_OF_PIPELINE--",
+                "action_name": "act_12",
+                "action_handle": 536870925,
+                "table_name": "tbl_spgw_egress_gtpu_encap_0",
                 "next_table": 0,
-                "next_table_full": 255,
+                "next_table_full": 35,
                 "vliw_instruction": 1,
-                "vliw_instruction_full": 73,
+                "vliw_instruction_full": 68,
                 "immediate_fields": []
               }
             ],
@@ -60291,8 +53075,8 @@
       },
       "actions": [
         {
-          "name": "act_13",
-          "handle": 536870958,
+          "name": "act_12",
+          "handle": 536870925,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60314,21 +53098,21 @@
               "dst": { "type": "phv", "name": "packet_in.$valid" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B30" }
+                { "type": "phv", "name": "B26" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "packet_in.ingress_port" },
               "src": [
-                { "type": "phv", "name": "H27" },
-                { "type": "phv", "name": "H28" }
+                { "type": "phv", "name": "H26" },
+                { "type": "phv", "name": "H27" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870958,
+      "default_action_handle": 536870925,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60344,7 +53128,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777231,
+      "handle": 16777229,
       "name": "tbl_act_1",
       "table_type": "match",
       "size": 512,
@@ -60563,8 +53347,8 @@
               "action_format": [
                 {
                   "action_name": "act_4",
-                  "action_handle": 536870959,
-                  "table_name": "tbl_act_19",
+                  "action_handle": 536870926,
+                  "table_name": "tbl_act_17",
                   "next_table": 0,
                   "next_table_full": 33,
                   "vliw_instruction": 1,
@@ -60610,7 +53394,7 @@
       "actions": [
         {
           "name": "act_4",
-          "handle": 536870959,
+          "handle": 536870926,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60630,16 +53414,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870959,
+      "default_action_handle": 536870926,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60649,7 +53433,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777232,
+      "handle": 16777230,
       "name": "tbl_act_2",
       "table_type": "match",
       "size": 1,
@@ -60676,7 +53460,7 @@
             "action_format": [
               {
                 "action_name": "act_2",
-                "action_handle": 536870960,
+                "action_handle": 536870927,
                 "table_name": "spgw_ingress_ue_filter_table",
                 "next_table": 0,
                 "next_table_full": 34,
@@ -60694,7 +53478,7 @@
       "actions": [
         {
           "name": "act_2",
-          "handle": 536870960,
+          "handle": 536870927,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -60724,12 +53508,12 @@
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [ { "type": "phv", "name": "H3" } ]
+              "src": [ { "type": "phv", "name": "H8" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ipv4.identification" },
-              "src": [ { "type": "phv", "name": "H9" } ]
+              "src": [ { "type": "phv", "name": "H6" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
@@ -60769,28 +53553,28 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H6" },
-              "src": [ { "type": "phv", "name": "H5" } ]
+              "dst": { "type": "phv", "name": "H3" },
+              "src": [ { "type": "phv", "name": "H2" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H8" },
-              "src": [ { "type": "phv", "name": "H7" } ]
+              "dst": { "type": "phv", "name": "H5" },
+              "src": [ { "type": "phv", "name": "H4" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W9" },
-              "src": [ { "type": "phv", "name": "W8" } ]
+              "dst": { "type": "phv", "name": "W12" },
+              "src": [ { "type": "phv", "name": "W11" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W11" },
-              "src": [ { "type": "phv", "name": "W10" } ]
+              "dst": { "type": "phv", "name": "W14" },
+              "src": [ { "type": "phv", "name": "W13" } ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870960,
+      "default_action_handle": 536870927,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -60806,7 +53590,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777233,
+      "handle": 16777231,
       "name": "spgw_ingress.ue_filter_table",
       "table_type": "match",
       "size": 512,
@@ -61707,8 +54491,8 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870961,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870928,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -61729,7 +54513,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870961,
+          "handle": 536870928,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -61748,7 +54532,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870961,
+      "default_action_handle": 536870928,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -61769,8 +54553,1131 @@
       ]
     },
     {
+      "direction": "egress",
+      "handle": 16777232,
+      "name": "tbl_spgw_egress_gtpu_encap",
+      "table_type": "match",
+      "size": 512,
+      "match_attributes": {
+        "stage_tables": [
+          {
+            "stage_number": 2,
+            "size": 512,
+            "stage_table_type": "ternary_match",
+            "logical_table_id": 3,
+            "default_next_table": 255,
+            "has_attached_gateway": true,
+            "pack_format": [
+              {
+                "table_word_width": 0,
+                "memory_word_width": 47,
+                "entries_per_table_word": 1,
+                "number_memory_units_per_table_word": 0,
+                "entries": [
+                  {
+                    "entry_number": 0,
+                    "fields": [
+                      {
+                        "field_name": "--tcam_payload_0--",
+                        "lsb_mem_word_offset": 0,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "payload",
+                        "start_bit": 0,
+                        "field_width": 1
+                      },
+                      {
+                        "field_name": "--tcam_parity_0--",
+                        "lsb_mem_word_offset": 45,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "parity",
+                        "start_bit": 0,
+                        "field_width": 2
+                      },
+                      {
+                        "field_name": "--unused--",
+                        "lsb_mem_word_offset": 1,
+                        "lsb_mem_word_idx": 0,
+                        "msb_mem_word_idx": 0,
+                        "source": "zero",
+                        "start_bit": 0,
+                        "field_width": 41
+                      }
+                    ]
+                  }
+                ]
+              }
+            ],
+            "memory_resource_allocation": {
+              "memory_type": "tcam",
+              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
+              "spare_bank_memory_unit": 0
+            },
+            "result_physical_buses": [ 3 ],
+            "ternary_indirection_stage_table": {
+              "stage_number": 2,
+              "stage_table_type": "ternary_indirection",
+              "size": 512,
+              "pack_format": [
+                {
+                  "memory_word_width": 128,
+                  "table_word_width": 128,
+                  "entries_per_table_word": 16,
+                  "number_memory_units_per_table_word": 1,
+                  "entries": [
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 121,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 127,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 113,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 119,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 105,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 111,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 97,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 103,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 89,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 95,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 81,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 87,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 73,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 79,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 64,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 65,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 71,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 57,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 63,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 49,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 55,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 41,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 47,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 33,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 39,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 25,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 31,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 17,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 23,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 9,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 15,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 0,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 0,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 6,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "immediate",
+                          "lsb_mem_word_offset": 1,
+                          "field_name": "immediate"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 1,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 7,
+                          "field_name": "--padding_7_7--"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
+              "action_format": [
+                {
+                  "action_name": "spgw_egress.gtpu_encap",
+                  "action_handle": 536870929,
+                  "table_name": "--END_OF_PIPELINE--",
+                  "next_table": 0,
+                  "next_table_full": 255,
+                  "vliw_instruction": 1,
+                  "vliw_instruction_full": 64,
+                  "immediate_fields": [
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 4,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 5,
+                      "dest_width": 1
+                    },
+                    {
+                      "param_name": "constant_1",
+                      "param_type": "constant",
+                      "const_value": 1,
+                      "param_shift": 0,
+                      "dest_start": 3,
+                      "dest_width": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        ],
+        "match_type": "ternary"
+      },
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554433,
+          "name": "tbl_spgw_egress_gtpu_encap_0$action"
+        }
+      ],
+      "selection_table_refs": [],
+      "meter_table_refs": [],
+      "statistics_table_refs": [],
+      "stateful_table_refs": [],
+      "actions": [
+        {
+          "name": "spgw_egress.gtpu_encap",
+          "handle": 536870929,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
+              "src": [
+                { "type": "action_param", "name": "$constant4" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
+              "src": [ { "immediate": "5395" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
+              "src": [ { "type": "phv", "name": "W25" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
+              "src": [ { "type": "phv", "name": "W23" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_udp.len" },
+              "src": [
+                { "type": "action_param", "name": "$constant3" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "src": [ { "type": "immediate", "name": "0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.msglen" },
+              "src": [ { "type": "phv", "name": "H21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.teid" },
+              "src": [ { "type": "phv", "name": "W21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B26" },
+              "src": [
+                { "type": "immediate", "name": "$data4" },
+                { "type": "phv", "name": "B26" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H29" },
+              "src": [ { "type": "action_param", "name": "$data0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H30" },
+              "src": [ { "type": "action_param", "name": "$data1" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W29" },
+              "src": [ { "type": "action_param", "name": "$data2" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W30" },
+              "src": [ { "type": "action_param", "name": "$data3" } ]
+            }
+          ]
+        }
+      ],
+      "default_action_handle": 536870929,
+      "action_profile": "",
+      "default_next_table_mask": 0,
+      "ap_bind_indirect_res_to_match": [],
+      "is_resource_controllable": true,
+      "uses_range": false,
+      "match_key_fields": []
+    },
+    {
+      "direction": "egress",
+      "handle": 33554433,
+      "name": "tbl_spgw_egress_gtpu_encap_0$action",
+      "table_type": "action",
+      "size": 1024,
+      "stage_tables": [
+        {
+          "stage_number": 2,
+          "size": 1024,
+          "stage_table_type": "action_data",
+          "logical_table_id": 3,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 1,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "$constant3"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "$constant4"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 40,
+                      "field_name": "$constant10"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "$constant11"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 3,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
+                      "lsb_mem_word_offset": 45,
+                      "field_name": "$constant5"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 44,
+                      "field_name": "$constant6"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 43,
+                      "field_name": "$constant7"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 42,
+                      "field_name": "$constant8"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 1,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
+                      "lsb_mem_word_offset": 41,
+                      "field_name": "$constant9"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
+                      "lsb_mem_word_offset": 60,
+                      "field_name": "$constant12"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
+                      "lsb_mem_word_offset": 56,
+                      "field_name": "$constant13"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 6,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
+                      "lsb_mem_word_offset": 50,
+                      "field_name": "$constant14"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 2,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "$constant15"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 3,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
+                      "lsb_mem_word_offset": 93,
+                      "field_name": "$constant16"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 13,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "$constant17"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 72,
+                      "field_name": "$constant18"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 8,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "$constant19"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "$constant20"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "$constant21"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870929
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 90
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "spgw_egress.gtpu_encap",
+          "handle": 536870929,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
+              "src": [
+                { "type": "action_param", "name": "$constant4" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
+              "src": [ { "immediate": "5395" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
+              "src": [ { "type": "phv", "name": "W25" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
+              "src": [ { "type": "phv", "name": "W23" } ]
+            },
+            {
+              "name": "DirectAluPrimitive",
+              "operation": "add",
+              "dst": { "type": "phv", "name": "gtpu_udp.len" },
+              "src": [
+                { "type": "action_param", "name": "$constant3" },
+                { "type": "phv", "name": "H21" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
+              "src": [ { "type": "immediate", "name": "0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.msglen" },
+              "src": [ { "type": "phv", "name": "H21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "gtpu.teid" },
+              "src": [ { "type": "phv", "name": "W21" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "B26" },
+              "src": [
+                { "type": "immediate", "name": "$data4" },
+                { "type": "phv", "name": "B26" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H29" },
+              "src": [ { "type": "action_param", "name": "$data0" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "H30" },
+              "src": [ { "type": "action_param", "name": "$data1" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W29" },
+              "src": [ { "type": "action_param", "name": "$data2" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "W30" },
+              "src": [ { "type": "action_param", "name": "$data3" } ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
       "direction": "ingress",
-      "handle": 16777234,
+      "handle": 16777233,
       "name": "spgw_ingress.s1u_filter_table",
       "table_type": "match",
       "size": 3072,
@@ -61779,7 +55686,7 @@
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
-      "default_action_handle": 536870962,
+      "default_action_handle": 536870930,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -64097,8 +58004,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870962,
-                "table_name": "tbl_act_22",
+                "action_handle": 536870930,
+                "table_name": "tbl_act_20",
                 "next_table": 0,
                 "next_table_full": 64,
                 "vliw_instruction": 0,
@@ -64492,7 +58399,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870962,
+          "handle": 536870930,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -64513,7 +58420,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777235,
+      "handle": 16777234,
       "name": "tbl_act_3",
       "table_type": "match",
       "size": 512,
@@ -64692,8 +58599,8 @@
               "action_format": [
                 {
                   "action_name": "act_1",
-                  "action_handle": 536870963,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870931,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -64739,7 +58646,7 @@
       "actions": [
         {
           "name": "act_1",
-          "handle": 536870963,
+          "handle": 536870931,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -64759,16 +58666,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870963,
+      "default_action_handle": 536870931,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -64778,7 +58685,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777236,
+      "handle": 16777235,
       "name": "tbl_act_4",
       "table_type": "match",
       "size": 512,
@@ -64957,8 +58864,8 @@
               "action_format": [
                 {
                   "action_name": "act_3",
-                  "action_handle": 536870964,
-                  "table_name": "tbl_act_22",
+                  "action_handle": 536870932,
+                  "table_name": "tbl_act_20",
                   "next_table": 0,
                   "next_table_full": 64,
                   "vliw_instruction": 0,
@@ -65004,7 +58911,7 @@
       "actions": [
         {
           "name": "act_3",
-          "handle": 536870964,
+          "handle": 536870932,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -65024,16 +58931,16 @@
             {
               "name": "DirectAluPrimitive",
               "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
+              "dst": { "type": "phv", "name": "H10" },
               "src": [
                 { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870964,
+      "default_action_handle": 536870932,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -65043,7 +58950,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777237,
+      "handle": 16777236,
       "name": "tbl_act_5",
       "table_type": "match",
       "size": 1,
@@ -65070,7 +58977,7 @@
             "action_format": [
               {
                 "action_name": "act_5",
-                "action_handle": 536870965,
+                "action_handle": 536870933,
                 "table_name": "cond-5",
                 "next_table": 0,
                 "next_table_full": 80,
@@ -65088,7 +58995,7 @@
       "actions": [
         {
           "name": "act_5",
-          "handle": 536870965,
+          "handle": 536870933,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -65110,13 +59017,13 @@
               "dst": { "type": "phv", "name": "spgw_ingress_hasReturned" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870965,
+      "default_action_handle": 536870933,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -65132,14 +59039,14 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777238,
+      "handle": 16777237,
       "name": "spgw_ingress.dl_sess_lookup",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554435,
+          "handle": 33554434,
           "name": "spgw_ingress_dl_sess_lookup$action"
         }
       ],
@@ -65147,7 +59054,7 @@
       "meter_table_refs": [],
       "statistics_table_refs": [],
       "stateful_table_refs": [],
-      "default_action_handle": 536870967,
+      "default_action_handle": 536870935,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -67615,7 +61522,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870967,
+                "action_handle": 536870935,
                 "table_name": "tbl_spgw_ingress_drop_now_0",
                 "next_table": 0,
                 "next_table_full": 82,
@@ -67625,7 +61532,7 @@
               },
               {
                 "action_name": "spgw_ingress.set_dl_sess_info",
-                "action_handle": 536870966,
+                "action_handle": 536870934,
                 "table_name": "tbl_spgw_ingress_drop_now_0",
                 "next_table": 0,
                 "next_table_full": 82,
@@ -68028,7 +61935,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870967,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68047,7 +61954,7 @@
         },
         {
           "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68098,7 +62005,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554435,
+      "handle": 33554434,
       "name": "spgw_ingress_dl_sess_lookup$action",
       "table_type": "action",
       "size": 4096,
@@ -68145,7 +62052,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870967
+              "action_handle": 536870935
             },
             {
               "memory_word_width": 128,
@@ -68200,7 +62107,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870966
+              "action_handle": 536870934
             }
           ],
           "memory_resource_allocation": {
@@ -68216,7 +62123,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870967,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68235,7 +62142,7 @@
         },
         {
           "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68287,7 +62194,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777239,
+      "handle": 16777238,
       "name": "tbl_spgw_ingress_drop_now",
       "table_type": "match",
       "size": 1,
@@ -68314,7 +62221,7 @@
             "action_format": [
               {
                 "action_name": "spgw_ingress.drop_now",
-                "action_handle": 536870968,
+                "action_handle": 536870936,
                 "table_name": "spgw_ingress_ue_cdr_table",
                 "next_table": 0,
                 "next_table_full": 96,
@@ -68332,7 +62239,7 @@
       "actions": [
         {
           "name": "spgw_ingress.drop_now",
-          "handle": 536870968,
+          "handle": 536870936,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -68362,13 +62269,13 @@
               "dst": { "type": "phv", "name": "hasExited_0" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870968,
+      "default_action_handle": 536870936,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -68384,7 +62291,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777240,
+      "handle": 16777239,
       "name": "spgw_ingress.ue_cdr_table",
       "table_type": "match",
       "size": 3072,
@@ -68399,7 +62306,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870970,
+      "default_action_handle": 536870938,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -70723,8 +64630,8 @@
             "action_format": [
               {
                 "action_name": "spgw_ingress.update_ue_cdr",
-                "action_handle": 536870969,
-                "table_name": "tbl_act_23",
+                "action_handle": 536870937,
+                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
                 "next_table": 0,
                 "next_table_full": 97,
                 "vliw_instruction": 0,
@@ -70733,8 +64640,8 @@
               },
               {
                 "action_name": "NoAction",
-                "action_handle": 536870970,
-                "table_name": "tbl_act_23",
+                "action_handle": 536870938,
+                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
                 "next_table": 0,
                 "next_table_full": 97,
                 "vliw_instruction": 0,
@@ -71161,7 +65068,7 @@
       "actions": [
         {
           "name": "spgw_ingress.update_ue_cdr",
-          "handle": 536870969,
+          "handle": 536870937,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -71180,7 +65087,7 @@
         },
         {
           "name": "NoAction",
-          "handle": 536870970,
+          "handle": 536870938,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -71241,93 +65148,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777241,
-      "name": "tbl_act_6",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_6",
-                "action_handle": 536870971,
-                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
-                "next_table": 0,
-                "next_table_full": 98,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_6",
-          "handle": 536870971,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.ipv4_len" },
-              "src": [ { "type": "phv", "name": "H4" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870971,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777242,
+      "handle": 16777240,
       "name": "tbl_spgw_ingress_gtpu_decap",
       "table_type": "match",
       "size": 512,
@@ -71337,8 +65158,8 @@
             "stage_number": 6,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
-            "default_next_table": 3,
+            "logical_table_id": 1,
+            "default_next_table": 2,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -71387,7 +65208,7 @@
               "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
               "spare_bank_memory_unit": 0
             },
-            "result_physical_buses": [ 3 ],
+            "result_physical_buses": [ 2 ],
             "ternary_indirection_stage_table": {
               "stage_number": 6,
               "stage_table_type": "ternary_indirection",
@@ -72206,12 +66027,12 @@
               "action_format": [
                 {
                   "action_name": "spgw_ingress.gtpu_decap",
-                  "action_handle": 536870972,
+                  "action_handle": 536870939,
                   "table_name": "filtering_ingress_port_vlan",
                   "next_table": 0,
-                  "next_table_full": 99,
+                  "next_table_full": 98,
                   "vliw_instruction": 1,
-                  "vliw_instruction_full": 66,
+                  "vliw_instruction_full": 65,
                   "immediate_fields": [
                     {
                       "param_name": "constant_0",
@@ -72245,7 +66066,7 @@
       "actions": [
         {
           "name": "spgw_ingress.gtpu_decap",
-          "handle": 536870972,
+          "handle": 536870939,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -72281,7 +66102,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870972,
+      "default_action_handle": 536870939,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -72291,7 +66112,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777243,
+      "handle": 16777241,
       "name": "filtering.ingress_port_vlan",
       "table_type": "match",
       "size": 512,
@@ -72301,8 +66122,8 @@
             "stage_number": 6,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 3,
-            "default_next_table": 4,
+            "logical_table_id": 2,
+            "default_next_table": 3,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -73228,42 +67049,42 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870975,
+                  "action_handle": 536870942,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 0,
                   "vliw_instruction_full": 64,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.push_internal_vlan",
-                  "action_handle": 536870973,
+                  "action_handle": 536870940,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 1,
-                  "vliw_instruction_full": 67,
+                  "vliw_instruction_full": 66,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.set_vlan",
-                  "action_handle": 536870974,
+                  "action_handle": 536870941,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 2,
                   "vliw_instruction_full": 68,
                   "immediate_fields": []
                 },
                 {
                   "action_name": "filtering.drop",
-                  "action_handle": 536870976,
+                  "action_handle": 536870943,
                   "table_name": "filtering_fwd_classifier",
                   "next_table": 0,
-                  "next_table_full": 100,
+                  "next_table_full": 99,
                   "vliw_instruction": 3,
-                  "vliw_instruction_full": 69,
+                  "vliw_instruction_full": 67,
                   "immediate_fields": []
                 }
               ]
@@ -73275,7 +67096,7 @@
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554436,
+          "handle": 33554435,
           "name": "filtering_ingress_port_vlan$action"
         }
       ],
@@ -73292,7 +67113,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870975,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -73311,7 +67132,7 @@
         },
         {
           "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73347,7 +67168,7 @@
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -73355,22 +67176,22 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
+              "dst": { "type": "phv", "name": "W10" },
               "src": [
                 { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             }
           ]
         },
         {
           "name": "filtering.set_vlan",
-          "handle": 536870974,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73398,14 +67219,14 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             }
           ]
         },
         {
           "name": "filtering.drop",
-          "handle": 536870976,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73432,7 +67253,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870975,
+      "default_action_handle": 536870942,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -73485,7 +67306,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 3,
+          "logical_table_id": 2,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -73515,7 +67336,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554436,
+      "handle": 33554435,
       "name": "filtering_ingress_port_vlan$action",
       "table_type": "action",
       "size": 2048,
@@ -73524,7 +67345,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "action_data",
-          "logical_table_id": 3,
+          "logical_table_id": 2,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -73562,7 +67383,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870975
+              "action_handle": 536870942
             },
             {
               "memory_word_width": 128,
@@ -73677,7 +67498,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870973
+              "action_handle": 536870940
             },
             {
               "memory_word_width": 128,
@@ -73750,7 +67571,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870974
+              "action_handle": 536870941
             },
             {
               "memory_word_width": 128,
@@ -73787,7 +67608,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870976
+              "action_handle": 536870943
             }
           ],
           "memory_resource_allocation": {
@@ -73800,7 +67621,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870975,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -73819,7 +67640,7 @@
         },
         {
           "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73855,7 +67676,7 @@
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -73863,22 +67684,22 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
+              "dst": { "type": "phv", "name": "W10" },
               "src": [
                 { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             }
           ]
         },
         {
           "name": "filtering.set_vlan",
-          "handle": 536870974,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73906,14 +67727,14 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             }
           ]
         },
         {
           "name": "filtering.drop",
-          "handle": 536870976,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -73944,7 +67765,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777244,
+      "handle": 16777242,
       "name": "filtering.fwd_classifier",
       "table_type": "match",
       "size": 3072,
@@ -73959,7 +67780,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870977,
+      "default_action_handle": 536870944,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -74006,8 +67827,8 @@
             "stage_number": 6,
             "size": 3072,
             "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 101,
+            "logical_table_id": 3,
+            "default_next_table": 100,
             "has_attached_gateway": false,
             "hash_functions": [
               {
@@ -79779,12 +73600,12 @@
             "action_format": [
               {
                 "action_name": "filtering.set_forwarding_type",
-                "action_handle": 536870977,
-                "table_name": "tbl_act_29",
+                "action_handle": 536870944,
+                "table_name": "tbl_act_26",
                 "next_table": 0,
-                "next_table_full": 101,
+                "next_table_full": 100,
                 "vliw_instruction": 0,
-                "vliw_instruction_full": 70,
+                "vliw_instruction_full": 69,
                 "immediate_fields": [
                   {
                     "param_name": "fwd_type",
@@ -80395,7 +74216,7 @@
       "actions": [
         {
           "name": "filtering.set_forwarding_type",
-          "handle": 536870977,
+          "handle": 536870944,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80424,7 +74245,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.fwd_type" },
               "src": [
                 { "type": "immediate", "name": "fwd_type" },
-                { "type": "phv", "name": "H11" }
+                { "type": "phv", "name": "H10" }
               ]
             }
           ]
@@ -80442,7 +74263,7 @@
           "stage_number": 6,
           "size": 4096,
           "stage_table_type": "statistics",
-          "logical_table_id": 4,
+          "logical_table_id": 3,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -80473,8 +74294,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777245,
-      "name": "tbl_act_12",
+      "handle": 16777243,
+      "name": "tbl_act_11",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -80484,7 +74305,7 @@
             "stage_number": 6,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 5,
+            "logical_table_id": 4,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -80499,11 +74320,11 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_12",
-                "action_handle": 536870978,
-                "table_name": "tbl_act_27",
+                "action_name": "act_11",
+                "action_handle": 536870945,
+                "table_name": "tbl_act_24",
                 "next_table": 0,
-                "next_table_full": 102,
+                "next_table_full": 101,
                 "vliw_instruction": 0,
                 "vliw_instruction_full": 64,
                 "immediate_fields": []
@@ -80517,8 +74338,8 @@
       },
       "actions": [
         {
-          "name": "act_12",
-          "handle": 536870978,
+          "name": "act_11",
+          "handle": 536870945,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80537,7 +74358,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870978,
+      "default_action_handle": 536870945,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -80553,8 +74374,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777246,
-      "name": "tbl_act_10",
+      "handle": 16777244,
+      "name": "tbl_act_9",
       "table_type": "match",
       "size": 512,
       "preferred_match_type": "exact",
@@ -80564,7 +74385,7 @@
             "stage_number": 6,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
+            "logical_table_id": 5,
             "default_next_table": 255,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
@@ -80576,11 +74397,11 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 2 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
-                "action_name": "act_10",
-                "action_handle": 536870979,
+                "action_name": "act_9",
+                "action_handle": 536870946,
                 "table_name": "forwarding_bridging",
                 "next_table": 0,
                 "next_table_full": 112,
@@ -80597,8 +74418,8 @@
       },
       "actions": [
         {
-          "name": "act_10",
-          "handle": 536870979,
+          "name": "act_9",
+          "handle": 536870946,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80617,7 +74438,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870979,
+      "default_action_handle": 536870946,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -80648,7 +74469,7 @@
           "stage_number": 6,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 6,
+          "logical_table_id": 5,
           "default_next_table": 255,
           "pack_format": [
             {
@@ -80678,7 +74499,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777247,
+      "handle": 16777245,
       "name": "forwarding.bridging",
       "table_type": "match",
       "size": 512,
@@ -80805,16 +74626,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 7,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -80829,22 +75025,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -80864,22 +75425,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -80894,7 +75445,7 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870981,
+                  "action_handle": 536870948,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -80904,21 +75455,13 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870980,
+                  "action_handle": 536870947,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 }
               ]
             }
@@ -80926,7 +75469,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554436,
+          "name": "forwarding_bridging$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -80940,7 +75489,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870981,
+          "handle": 536870948,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80955,12 +75504,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870980,
+          "handle": 536870947,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -80982,17 +75530,24 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870981,
+      "default_action_handle": 536870948,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -81064,11 +75619,230 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777248,
+      "handle": 33554436,
+      "name": "forwarding_bridging$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 0,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870948
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870947
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 81 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 81
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870948,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870947,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777246,
       "name": "forwarding.mpls",
       "table_type": "match",
       "size": 3072,
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554437,
+          "name": "forwarding_mpls$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -81079,7 +75853,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870983,
+      "default_action_handle": 536870950,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -82479,8 +77253,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870983,
-                "table_name": "tbl_act_24",
+                "action_handle": 536870950,
+                "table_name": "tbl_act_21",
                 "next_table": 0,
                 "next_table_full": 114,
                 "vliw_instruction": 0,
@@ -82489,8 +77263,8 @@
               },
               {
                 "action_name": "forwarding.pop_mpls_and_next",
-                "action_handle": 536870982,
-                "table_name": "tbl_act_24",
+                "action_handle": 536870949,
+                "table_name": "tbl_act_21",
                 "next_table": 0,
                 "next_table_full": 114,
                 "vliw_instruction": 1,
@@ -82500,8 +77274,8 @@
                     "param_name": "next_id",
                     "param_type": "parameter",
                     "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 32
+                    "dest_start": 16,
+                    "dest_width": 16
                   }
                 ]
               }
@@ -82889,10 +77663,11 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870983,
+          "handle": 536870950,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
           "p4_parameters": [],
           "override_meter_addr": false,
           "override_meter_addr_pfe": false,
@@ -82903,15 +77678,15 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.pop_mpls_and_next",
-          "handle": 536870982,
+          "handle": 536870949,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
           "p4_parameters": [
             {
               "name": "next_id",
@@ -82929,7 +77704,6 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
@@ -82941,8 +77715,16 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "immediate", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
@@ -82990,8 +77772,343 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777249,
-      "name": "tbl_act_7",
+      "handle": 33554437,
+      "name": "forwarding_mpls$action",
+      "table_type": "action",
+      "size": 8192,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 8192,
+          "stage_table_type": "action_data",
+          "logical_table_id": 1,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 8,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 7,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 6,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 5,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 4,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 3,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 2,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870950
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 8,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 7,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 6,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 5,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 4,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 3,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 2,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "next_id"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870949
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 88
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870950,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.pop_mpls_and_next",
+          "handle": 536870949,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "mpls.$valid" },
+              "src": [
+                { "type": "immediate", "name": "0" },
+                { "type": "phv", "name": "B8" }
+              ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "immediate", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777247,
+      "name": "tbl_act_6",
       "table_type": "match",
       "size": 512,
       "match_attributes": {
@@ -83188,8 +78305,8 @@
               "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
               "action_format": [
                 {
-                  "action_name": "act_7",
-                  "action_handle": 536870984,
+                  "action_name": "act_6",
+                  "action_handle": 536870951,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -83215,8 +78332,8 @@
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554437,
-          "name": "tbl_act_24$action"
+          "handle": 33554438,
+          "name": "tbl_act_21$action"
         }
       ],
       "selection_table_refs": [],
@@ -83225,8 +78342,8 @@
       "stateful_table_refs": [],
       "actions": [
         {
-          "name": "act_7",
-          "handle": 536870984,
+          "name": "act_6",
+          "handle": 536870951,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83247,7 +78364,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -83255,13 +78372,13 @@
               "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
+                { "type": "phv", "name": "W35" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870984,
+      "default_action_handle": 536870951,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -83271,8 +78388,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554437,
-      "name": "tbl_act_24$action",
+      "handle": 33554438,
+      "name": "tbl_act_21$action",
       "table_type": "action",
       "size": 4096,
       "stage_tables": [
@@ -83386,7 +78503,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870984
+              "action_handle": 536870951
             }
           ],
           "memory_resource_allocation": {
@@ -83398,8 +78515,8 @@
       ],
       "actions": [
         {
-          "name": "act_7",
-          "handle": 536870984,
+          "name": "act_6",
+          "handle": 536870951,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83420,7 +78537,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -83428,7 +78545,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
+                { "type": "phv", "name": "W35" }
               ]
             }
           ]
@@ -83438,7 +78555,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777250,
+      "handle": 16777248,
       "name": "forwarding.unicast_v4",
       "table_type": "match",
       "size": 512,
@@ -83583,16 +78700,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 7,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -83607,22 +79099,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -83642,22 +79499,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -83672,7 +79519,7 @@
               "action_format": [
                 {
                   "action_name": "NoAction",
-                  "action_handle": 536870986,
+                  "action_handle": 536870953,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
@@ -83682,21 +79529,13 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870985,
+                  "action_handle": 536870952,
                   "table_name": "forwarding_acl",
                   "next_table": 0,
                   "next_table_full": 128,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 68,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 }
               ]
             }
@@ -83704,7 +79543,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554439,
+          "name": "forwarding_unicast_v4$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -83718,7 +79563,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870986,
+          "handle": 536870953,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83733,12 +79578,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870985,
+          "handle": 536870952,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -83760,17 +79604,24 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870986,
+      "default_action_handle": 536870953,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -83831,7 +79682,220 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777251,
+      "handle": 33554439,
+      "name": "forwarding_unicast_v4$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 7,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 3,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870953
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870952
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 75 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 75
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "NoAction",
+          "handle": 536870953,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870952,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777249,
       "name": "forwarding.acl",
       "table_type": "match",
       "size": 256,
@@ -83999,7 +80063,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.l4_dst_port",
+                        "field_name": "fabric_metadata.original_ether_type",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 5,
                         "msb_mem_word_idx": 5,
@@ -84026,7 +80090,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.original_ether_type",
+                        "field_name": "ipv4.dst_addr",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -84053,7 +80117,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.dst_addr",
+                        "field_name": "ipv4.src_addr",
                         "lsb_mem_word_offset": 9,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -84062,7 +80126,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.l4_dst_port",
+                        "field_name": "fabric_metadata.original_ether_type",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -84089,7 +80153,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "fabric_metadata.original_ether_type",
+                        "field_name": "ipv4.dst_addr",
                         "lsb_mem_word_offset": 1,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84116,7 +80180,7 @@
                         "field_width": 4
                       },
                       {
-                        "field_name": "ipv4.src_addr",
+                        "field_name": "standard_metadata.ingress_port",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84125,7 +80189,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.dst_addr",
+                        "field_name": "ipv4.src_addr",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -84152,7 +80216,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "standard_metadata.ingress_port",
+                        "field_name": "ethernet.dst_addr",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84161,7 +80225,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ipv4.src_addr",
+                        "field_name": "fabric_metadata.l4_dst_port",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84170,7 +80234,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "ethernet.dst_addr",
+                        "field_name": "fabric_metadata.l4_dst_port",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 1,
                         "msb_mem_word_idx": 1,
@@ -84282,16 +80346,391 @@
             "ternary_indirection_stage_table": {
               "stage_number": 8,
               "stage_table_type": "ternary_indirection",
-              "size": 2048,
+              "size": 32768,
               "pack_format": [
                 {
                   "memory_word_width": 128,
                   "table_word_width": 128,
-                  "entries_per_table_word": 2,
+                  "entries_per_table_word": 32,
                   "number_memory_units_per_table_word": 1,
                   "entries": [
                     {
-                      "entry_number": 1,
+                      "entry_number": 31,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 124,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 126,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 30,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 120,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 122,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 29,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 116,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 118,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 28,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 112,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 114,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 27,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 108,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 110,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 26,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 104,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 106,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 25,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 100,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 102,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 24,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 96,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 98,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 23,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 92,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 94,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 22,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 88,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 90,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 21,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 84,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 86,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 20,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 80,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 82,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 19,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 76,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 78,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 18,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 72,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 74,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 17,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 68,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 70,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 16,
                       "fields": [
                         {
                           "start_bit": 0,
@@ -84306,22 +80745,387 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
-                          "source": "immediate",
+                          "source": "zero",
                           "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 15,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 60,
+                          "field_name": "action"
                         },
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 62,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 14,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 56,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 58,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 13,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 52,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 54,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 12,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 48,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 50,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 11,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 44,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 46,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 10,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 40,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 42,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 9,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 36,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 38,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 8,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 32,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 34,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 7,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 28,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 30,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 6,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 24,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 26,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 5,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 20,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 22,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 4,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 16,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 18,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 3,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 12,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 14,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 2,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 8,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 10,
+                          "field_name": "--padding_2_3--"
+                        }
+                      ]
+                    },
+                    {
+                      "entry_number": 1,
+                      "fields": [
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "instr",
+                          "lsb_mem_word_offset": 4,
+                          "field_name": "action"
+                        },
+                        {
+                          "start_bit": 0,
+                          "enable_pfe": false,
+                          "field_width": 2,
+                          "lsb_mem_word_idx": 0,
+                          "msb_mem_word_idx": 0,
+                          "source": "zero",
+                          "lsb_mem_word_offset": 6,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     },
@@ -84341,22 +81145,12 @@
                         {
                           "start_bit": 0,
                           "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
+                          "field_width": 2,
                           "lsb_mem_word_idx": 0,
                           "msb_mem_word_idx": 0,
                           "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
+                          "lsb_mem_word_offset": 2,
+                          "field_name": "--padding_2_3--"
                         }
                       ]
                     }
@@ -84371,7 +81165,7 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870990,
+                  "action_handle": 536870957,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
@@ -84381,44 +81175,27 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870987,
+                  "action_handle": 536870954,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
                   "vliw_instruction": 1,
                   "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
+                  "immediate_fields": []
                 },
                 {
                   "action_name": "forwarding.duplicate_to_controller",
-                  "action_handle": 536870988,
+                  "action_handle": 536870955,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
                   "vliw_instruction": 2,
                   "vliw_instruction_full": 65,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_320",
-                      "param_type": "constant",
-                      "const_value": 320,
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 9
-                    }
-                  ]
+                  "immediate_fields": []
                 },
                 {
                   "action_name": "forwarding.drop",
-                  "action_handle": 536870989,
+                  "action_handle": 536870956,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 144,
@@ -84432,7 +81209,13 @@
         ],
         "match_type": "ternary"
       },
-      "action_data_table_refs": [],
+      "action_data_table_refs": [
+        {
+          "how_referenced": "direct",
+          "handle": 33554440,
+          "name": "forwarding_acl$action"
+        }
+      ],
       "selection_table_refs": [],
       "meter_table_refs": [],
       "statistics_table_refs": [
@@ -84446,7 +81229,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870990,
+          "handle": 536870957,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -84461,12 +81244,11 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": []
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870987,
+          "handle": 536870954,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84488,18 +81270,25 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
             }
           ]
         },
         {
           "name": "forwarding.duplicate_to_controller",
-          "handle": 536870988,
+          "handle": 536870955,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84514,13 +81303,12 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
-                { "type": "immediate", "name": "$constant0" },
+                { "type": "action_param", "name": "$constant0" },
                 { "type": "phv", "name": "H1" }
               ]
             }
@@ -84528,7 +81316,7 @@
         },
         {
           "name": "forwarding.drop",
-          "handle": 536870989,
+          "handle": 536870956,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -84543,7 +81331,6 @@
           "override_stateful_addr": false,
           "override_stateful_addr_pfe": false,
           "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
           "primitives": [
             {
               "name": "ModifyFieldPrimitive",
@@ -84556,7 +81343,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870990,
+      "default_action_handle": 536870957,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -84738,14 +81525,395 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777252,
+      "handle": 33554440,
+      "name": "forwarding_acl$action",
+      "table_type": "action",
+      "size": 2048,
+      "stage_tables": [
+        {
+          "stage_number": 8,
+          "size": 2048,
+          "stage_table_type": "action_data",
+          "logical_table_id": 0,
+          "default_next_table": 255,
+          "pack_format": [
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870957
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 112,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 16,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "next_id"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "--padding_32_47--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870954
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 192, "dest_width": 9 } ],
+                      "lsb_mem_word_offset": 80,
+                      "field_name": "$constant0"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 39,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 89,
+                      "field_name": "--padding_25_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "constant",
+                      "const_tuples": [ { "dest_start": 0, "value": 192, "dest_width": 9 } ],
+                      "lsb_mem_word_offset": 16,
+                      "field_name": "$constant0"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_15--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 39,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 25,
+                      "field_name": "--padding_25_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870955
+            },
+            {
+              "memory_word_width": 128,
+              "table_word_width": 128,
+              "entries_per_table_word": 2,
+              "number_memory_units_per_table_word": 1,
+              "entries": [
+                {
+                  "entry_number": 1,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 64,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                },
+                {
+                  "entry_number": 0,
+                  "fields": [
+                    {
+                      "start_bit": 0,
+                      "field_width": 64,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 0,
+                      "field_name": "--padding_0_63--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870956
+            }
+          ],
+          "memory_resource_allocation": {
+            "memory_type": "sram",
+            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
+            "spare_bank_memory_unit": 90
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "nop",
+          "handle": 536870957,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "constant_default_action": false,
+          "disallowed_as_default_action_reason": "",
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": []
+        },
+        {
+          "name": "forwarding.set_next_id",
+          "handle": 536870954,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [
+            {
+              "name": "next_id",
+              "start_bit": 0,
+              "position": 0,
+              "bit_width": 32
+            }
+          ],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.16-31" },
+              "src": [ { "type": "action_param", "name": "next_id.16-31" } ]
+            },
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "fabric_metadata.next_id.0-15" },
+              "src": [
+                { "type": "action_param", "name": "next_id.0-15" },
+                { "type": "phv", "name": "W7" }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "forwarding.duplicate_to_controller",
+          "handle": 536870955,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
+              "src": [
+                { "type": "action_param", "name": "$constant0" },
+                { "type": "phv", "name": "H1" }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "forwarding.drop",
+          "handle": 536870956,
+          "indirect_resources": [],
+          "allowed_as_default_action": true,
+          "disallowed_as_default_action_reason": "",
+          "constant_default_action": false,
+          "p4_parameters": [],
+          "override_meter_addr": false,
+          "override_meter_addr_pfe": false,
+          "override_meter_full_addr": 0,
+          "override_stat_addr": false,
+          "override_stat_addr_pfe": false,
+          "override_stat_full_addr": 0,
+          "override_stateful_addr": false,
+          "override_stateful_addr_pfe": false,
+          "override_stateful_full_addr": 0,
+          "primitives": [
+            {
+              "name": "ModifyFieldPrimitive",
+              "dst": { "type": "phv", "name": "ig_intr_md_for_dprs.drop_ctl" },
+              "src": [
+                { "type": "immediate", "name": "1" },
+                { "type": "phv", "name": "B2" }
+              ]
+            }
+          ]
+        }
+      ],
+      "how_referenced": "direct"
+    },
+    {
+      "direction": "ingress",
+      "handle": 16777250,
       "name": "next.simple",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 33554438,
+          "handle": 33554441,
           "name": "next_simple$action"
         }
       ],
@@ -84759,7 +81927,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870995,
+      "default_action_handle": 536870962,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -84795,6 +81963,54 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 0,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -84817,54 +82033,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -84873,13 +82041,55 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -84895,48 +82105,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -84945,49 +82113,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -84999,19 +82155,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
+                        "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85021,6 +82165,30 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85029,31 +82197,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85065,7 +82209,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85077,7 +82221,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85089,31 +82257,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85125,7 +82269,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85137,40 +82281,64 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 4,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85179,36 +82347,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85221,13 +82359,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85245,19 +82383,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85269,60 +82437,24 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85335,13 +82467,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85353,37 +82521,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85401,19 +82539,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85425,42 +82593,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85473,7 +82605,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85491,7 +82635,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85503,13 +82653,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85521,67 +82689,67 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 24,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85593,37 +82761,19 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 0,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
+                        "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85635,24 +82785,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85665,13 +82797,49 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85683,42 +82851,18 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85731,13 +82875,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85747,6 +82897,24 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85755,37 +82923,7 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85803,13 +82941,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85825,6 +82957,42 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -85833,13 +83001,67 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 3,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 14,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85857,7 +83079,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85885,21 +83125,9 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85911,13 +83139,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 15,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 17,
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85953,6 +83187,264 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 16,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 17,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 18,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -85971,7 +83463,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -85979,17 +83495,155 @@
                     ]
                   },
                   {
-                    "hash_bit": 15,
+                    "hash_bit": 19,
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 5,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 20,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86017,14 +83671,98 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 21,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 22,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86043,6 +83781,18 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86061,540 +83811,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
                         "field_bit": 2,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86607,13 +83823,229 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 23,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 24,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 4,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 25,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 26,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86631,66 +84063,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86703,66 +84075,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86775,107 +84087,35 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
                       {
                         "field_bit": 6,
                         "field_name": "fabric_metadata.next_id",
@@ -86883,18 +84123,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -86907,13 +84135,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 14,
+                        "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 27,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86937,7 +84171,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86949,19 +84183,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -86971,13 +84193,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 7,
                         "field_name": "fabric_metadata.next_id",
@@ -86985,43 +84201,43 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 28,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
-                        "field_bit": 16,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 20,
+                        "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -87049,13 +84265,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
@@ -87069,12 +84279,24 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 16,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 29,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -87099,6 +84321,18 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -87111,7 +84345,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 29,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -87121,13 +84355,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
@@ -87157,66 +84385,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   }
@@ -87227,7 +84395,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870995,
+                "action_handle": 536870962,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87237,7 +84405,7 @@
               },
               {
                 "action_name": "next.output",
-                "action_handle": 536870991,
+                "action_handle": 536870958,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87247,7 +84415,7 @@
               },
               {
                 "action_name": "next.set_vlan_output",
-                "action_handle": 536870992,
+                "action_handle": 536870959,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87257,7 +84425,7 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870993,
+                "action_handle": 536870960,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87267,7 +84435,7 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870994,
+                "action_handle": 536870961,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -87695,7 +84863,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870995,
+          "handle": 536870962,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87714,7 +84882,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870991,
+          "handle": 536870958,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87749,7 +84917,7 @@
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870992,
+          "handle": 536870959,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87783,7 +84951,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -87791,7 +84959,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
@@ -87806,7 +84974,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870993,
+          "handle": 536870960,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87849,7 +85017,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -87866,7 +85034,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870994,
+          "handle": 536870961,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -87918,7 +85086,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -87931,7 +85099,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -87946,7 +85114,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -87995,7 +85163,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554438,
+      "handle": 33554441,
       "name": "next_simple$action",
       "table_type": "action",
       "size": 3072,
@@ -88028,7 +85196,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870995
+              "action_handle": 536870962
             },
             {
               "memory_word_width": 128,
@@ -88069,7 +85237,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870991
+              "action_handle": 536870958
             },
             {
               "memory_word_width": 128,
@@ -88128,7 +85296,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870992
+              "action_handle": 536870959
             },
             {
               "memory_word_width": 128,
@@ -88205,7 +85373,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870993
+              "action_handle": 536870960
             },
             {
               "memory_word_width": 128,
@@ -88340,7 +85508,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870994
+              "action_handle": 536870961
             }
           ],
           "memory_resource_allocation": {
@@ -88357,7 +85525,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870995,
+          "handle": 536870962,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88376,7 +85544,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870991,
+          "handle": 536870958,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88411,7 +85579,7 @@
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870992,
+          "handle": 536870959,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88445,7 +85613,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -88453,7 +85621,7 @@
               "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
               "src": [
                 { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
+                { "type": "phv", "name": "H12" }
               ]
             },
             {
@@ -88468,7 +85636,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870993,
+          "handle": 536870960,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88511,7 +85679,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -88528,7 +85696,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870994,
+          "handle": 536870961,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88580,7 +85748,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -88593,7 +85761,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -88608,7 +85776,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -88618,8 +85786,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777253,
-      "name": "tbl_act_8",
+      "handle": 16777251,
+      "name": "tbl_act_7",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -88644,8 +85812,8 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_8",
-                "action_handle": 536870996,
+                "action_name": "act_7",
+                "action_handle": 536870963,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 162,
@@ -88662,8 +85830,8 @@
       },
       "actions": [
         {
-          "name": "act_8",
-          "handle": 536870996,
+          "name": "act_7",
+          "handle": 536870963,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -88692,7 +85860,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870996,
+      "default_action_handle": 536870963,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -88708,14 +85876,14 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777254,
+      "handle": 16777252,
       "name": "next.hashed",
       "table_type": "match",
       "size": 3072,
       "action_data_table_refs": [
         {
           "how_referenced": "indirect",
-          "handle": 33554439,
+          "handle": 33554442,
           "name": "next.ecmp_selector"
         }
       ],
@@ -88737,7 +85905,7 @@
       "stateful_table_refs": [],
       "default_selector_mask": 0,
       "default_selector_value": 0,
-      "default_action_handle": 536871000,
+      "default_action_handle": 536870967,
       "action_profile": "next.ecmp_selector",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -88773,6 +85941,30 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -88785,13 +85977,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88809,37 +86001,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88851,19 +86019,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 19,
+                        "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 23,
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88875,43 +86061,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
+                        "field_bit": 29,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88923,54 +86091,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 2,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -88983,7 +86103,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -88993,6 +86113,54 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89001,72 +86169,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 3,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89103,7 +86205,73 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89115,13 +86283,31 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 17,
+                        "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89139,7 +86325,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 26,
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89161,36 +86359,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89199,61 +86367,13 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 5,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 10,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89265,7 +86385,55 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89277,54 +86445,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 6,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89343,22 +86463,70 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 15,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89367,19 +86535,49 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 17,
+                        "field_bit": 18,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89397,7 +86595,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89407,36 +86605,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89445,42 +86613,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 8,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89493,7 +86625,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89505,7 +86637,43 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89517,19 +86685,37 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 18,
+                        "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 19,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89545,24 +86731,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89571,6 +86739,36 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 0,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89583,7 +86781,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89595,12 +86799,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89619,7 +86817,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 28,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89635,36 +86833,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       }
                     ]
                   },
@@ -89673,48 +86841,6 @@
                     "seed": 0,
                     "bits_to_xor": [
                       {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 1,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89727,7 +86853,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89743,96 +86869,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 20,
@@ -89847,90 +86883,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89943,6 +86895,90 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 12,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 30,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89953,8 +86989,92 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 13,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 14,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -89967,13 +87087,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
+                        "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -89983,21 +87097,9 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 18,
+                        "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90009,13 +87111,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
+                        "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90027,66 +87123,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90099,7 +87135,31 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 6,
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 15,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 5,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90111,7 +87171,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90127,13 +87187,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 17,
                         "field_name": "fabric_metadata.next_id",
@@ -90147,6 +87201,150 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 16,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 17,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90165,156 +87363,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90331,13 +87379,91 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 18,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 19,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
                         "field_bit": 9,
                         "field_name": "fabric_metadata.next_id",
@@ -90351,7 +87477,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 12,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90361,18 +87487,6 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
                       },
                       {
                         "field_bit": 17,
@@ -90387,12 +87501,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 24,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90411,13 +87519,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90427,7 +87529,13 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 20,
+                    "seed": 0,
+                    "bits_to_xor": [
                       {
                         "field_bit": 0,
                         "field_name": "fabric_metadata.next_id",
@@ -90441,67 +87549,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
+                        "field_bit": 11,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90513,18 +87561,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90537,144 +87573,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 19,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90687,13 +87585,13 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 21,
+                        "field_bit": 22,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90711,7 +87609,67 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 27,
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 21,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 1,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -90723,6 +87681,162 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 22,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 2,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 23,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 3,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 15,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 23,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 24,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
                         "field_bit": 4,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90735,222 +87849,6 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
                         "field_bit": 13,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -90967,13 +87865,7 @@
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
+                      },
                       {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
@@ -90987,13 +87879,25 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 21,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 23,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 25,
+                        "field_bit": 26,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91005,25 +87909,7 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
+                        "field_bit": 29,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91031,10 +87917,22 @@
                     ]
                   },
                   {
-                    "hash_bit": 29,
+                    "hash_bit": 25,
                     "seed": 0,
                     "bits_to_xor": [
                       {
+                        "field_bit": 5,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 16,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
@@ -91047,13 +87945,19 @@
                         "hash_match_group_bit": 0
                       },
                       {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
                         "field_bit": 20,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 22,
+                        "field_bit": 21,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91071,13 +87975,37 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 9,
+                        "field_bit": 27,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 11,
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 26,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 6,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91095,7 +88023,247 @@
                         "hash_match_group_bit": 0
                       },
                       {
-                        "field_bit": 15,
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 24,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 27,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 7,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 12,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 20,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 26,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 28,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 8,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 13,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 17,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 22,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 25,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 29,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      }
+                    ]
+                  },
+                  {
+                    "hash_bit": 29,
+                    "seed": 0,
+                    "bits_to_xor": [
+                      {
+                        "field_bit": 9,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 10,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 11,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 14,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 16,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 18,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 19,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 27,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 28,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 30,
+                        "field_name": "fabric_metadata.next_id",
+                        "hash_match_group": 0,
+                        "hash_match_group_bit": 0
+                      },
+                      {
+                        "field_bit": 31,
                         "field_name": "fabric_metadata.next_id",
                         "hash_match_group": 0,
                         "hash_match_group_bit": 0
@@ -91109,8 +88277,8 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536871000,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870967,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 0,
@@ -91119,8 +88287,8 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870997,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870964,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 1,
@@ -91129,8 +88297,8 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870998,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870965,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 2,
@@ -91139,8 +88307,8 @@
               },
               {
                 "action_name": "next.mpls_routing_v6",
-                "action_handle": 536870999,
-                "table_name": "tbl_act_28",
+                "action_handle": 536870966,
+                "table_name": "tbl_act_25",
                 "next_table": 0,
                 "next_table_full": 176,
                 "vliw_instruction": 3,
@@ -91633,7 +88801,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536871000,
+          "handle": 536870967,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91652,7 +88820,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870997,
+          "handle": 536870964,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91695,7 +88863,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91712,7 +88880,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870998,
+          "handle": 536870965,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91764,7 +88932,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -91777,7 +88945,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91792,14 +88960,14 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870999,
+          "handle": 536870966,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -91851,7 +89019,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -91864,7 +89032,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -91879,7 +89047,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -91895,7 +89063,7 @@
       "selection_type": "fair",
       "how_referenced": "indirect",
       "max_port_pool_size": 120,
-      "bound_to_action_data_table_handle": 33554439,
+      "bound_to_action_data_table_handle": 33554442,
       "stage_tables": [
         {
           "stage_number": 10,
@@ -91922,7 +89090,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 33554439,
+      "handle": 33554442,
       "name": "next.ecmp_selector",
       "table_type": "action",
       "size": 64,
@@ -91955,7 +89123,7 @@
                   ]
                 }
               ],
-              "action_handle": 536871000
+              "action_handle": 536870967
             },
             {
               "memory_word_width": 128,
@@ -92032,7 +89200,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870997
+              "action_handle": 536870964
             },
             {
               "memory_word_width": 128,
@@ -92167,7 +89335,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870998
+              "action_handle": 536870965
             },
             {
               "memory_word_width": 128,
@@ -92302,7 +89470,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870999
+              "action_handle": 536870966
             }
           ],
           "memory_resource_allocation": {
@@ -92315,7 +89483,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536871000,
+          "handle": 536870967,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92334,7 +89502,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870997,
+          "handle": 536870964,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92377,7 +89545,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92394,7 +89562,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870998,
+          "handle": 536870965,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92446,7 +89614,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -92459,7 +89627,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92474,14 +89642,14 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870999,
+          "handle": 536870966,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92533,7 +89701,7 @@
               "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
               "src": [
                 { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
+                { "type": "phv", "name": "W10" }
               ]
             },
             {
@@ -92546,7 +89714,7 @@
               "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
               "src": [
                 { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92561,7 +89729,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
+              "dst": { "type": "phv", "name": "W32" },
               "src": [ { "type": "action_param", "name": "$data0" } ]
             }
           ]
@@ -92611,8 +89779,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777255,
-      "name": "tbl_act_11",
+      "handle": 16777253,
+      "name": "tbl_act_10",
       "table_type": "match",
       "size": 1,
       "preferred_match_type": "exact",
@@ -92637,9 +89805,9 @@
             "result_physical_buses": [ 0 ],
             "action_format": [
               {
-                "action_name": "act_11",
-                "action_handle": 536871001,
-                "table_name": "tbl_act_26",
+                "action_name": "act_10",
+                "action_handle": 536870968,
+                "table_name": "tbl_act_23",
                 "next_table": 0,
                 "next_table_full": 177,
                 "vliw_instruction": 1,
@@ -92655,8 +89823,8 @@
       },
       "actions": [
         {
-          "name": "act_11",
-          "handle": 536871001,
+          "name": "act_10",
+          "handle": 536870968,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92677,8 +89845,8 @@
               "name": "ModifyFieldPrimitive",
               "dst": { "type": "phv", "name": "ethernet.ether_type" },
               "src": [
-                { "type": "phv", "name": "W7" },
-                { "type": "phv", "name": "W6" }
+                { "type": "phv", "name": "W10" },
+                { "type": "phv", "name": "W9" }
               ]
             },
             {
@@ -92692,7 +89860,7 @@
           ]
         }
       ],
-      "default_action_handle": 536871001,
+      "default_action_handle": 536870968,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -92708,8 +89876,8 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777256,
-      "name": "tbl_act_9",
+      "handle": 16777254,
+      "name": "tbl_act_8",
       "table_type": "match",
       "size": 512,
       "preferred_match_type": "exact",
@@ -92734,8 +89902,8 @@
             "result_physical_buses": [ 1 ],
             "action_format": [
               {
-                "action_name": "act_9",
-                "action_handle": 536871002,
+                "action_name": "act_8",
+                "action_handle": 536870969,
                 "table_name": "--END_OF_PIPELINE--",
                 "next_table": 0,
                 "next_table_full": 255,
@@ -92752,8 +89920,8 @@
       },
       "actions": [
         {
-          "name": "act_9",
-          "handle": 536871002,
+          "name": "act_8",
+          "handle": 536870969,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "constant_default_action": false,
@@ -92772,7 +89940,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536871002,
+      "default_action_handle": 536870969,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -92861,27 +90029,17 @@
     {
       "fully_qualified_name": "mau[0].dp.match_input_xbar_din_power_ctl",
       "name": "stage_0_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000001800000022000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[0].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_0_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000001800000008000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[1].dp.match_input_xbar_din_power_ctl",
       "name": "stage_1_match_input_xbar_din_power_ctl",
-      "value": "00000000000000000000000000000000000000800000000000000000000000de000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[1].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_1_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000080000000000000000000000018000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[2].dp.match_input_xbar_din_power_ctl",
       "name": "stage_2_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000000000000000000000000000040000000000000000000000003000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[3].dp.match_input_xbar_din_power_ctl",
@@ -92896,12 +90054,12 @@
     {
       "fully_qualified_name": "mau[4].dp.match_input_xbar_din_power_ctl",
       "name": "stage_4_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[5].dp.match_input_xbar_din_power_ctl",
       "name": "stage_5_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[5].dp.xbar_hash.hash.parity_group_mask",
@@ -92911,7 +90069,7 @@
     {
       "fully_qualified_name": "mau[6].dp.match_input_xbar_din_power_ctl",
       "name": "stage_6_match_input_xbar_din_power_ctl",
-      "value": "0000009000000040000000000000000000000000000000010000000000000000000000000000003800000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000004000000000000000000000000000000010000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[6].dp.xbar_hash.hash.parity_group_mask",
@@ -92921,7 +90079,7 @@
     {
       "fully_qualified_name": "mau[7].dp.match_input_xbar_din_power_ctl",
       "name": "stage_7_match_input_xbar_din_power_ctl",
-      "value": "0000009000000060000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[7].dp.xbar_hash.hash.parity_group_mask",
@@ -92931,12 +90089,12 @@
     {
       "fully_qualified_name": "mau[8].dp.match_input_xbar_din_power_ctl",
       "name": "stage_8_match_input_xbar_din_power_ctl",
-      "value": "000000d2000000c000000000000000000000002000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "000000120000000600000000000000000000002000000000000000000000000000000000000000b80000000000000000000000000000000100000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[9].dp.match_input_xbar_din_power_ctl",
       "name": "stage_9_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000008000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[9].dp.xbar_hash.hash.parity_group_mask",
@@ -92946,7 +90104,7 @@
     {
       "fully_qualified_name": "mau[10].dp.match_input_xbar_din_power_ctl",
       "name": "stage_10_match_input_xbar_din_power_ctl",
-      "value": "0000001200000000000000000000000000000060000000010000000000000000000000000000008000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "000000920000000000000000000000000000006000000001000000000000000000000000000000c000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[10].dp.xbar_hash.hash.parity_group_mask",
@@ -92956,7 +90114,7 @@
     {
       "fully_qualified_name": "mau[11].dp.match_input_xbar_din_power_ctl",
       "name": "stage_11_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[11].dp.xbar_hash.hash.parity_group_mask",
@@ -92964,4 +90122,4 @@
       "value": "00000001000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/fabric.p4info
old mode 100644
new mode 100755
similarity index 67%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/fabric.p4info
index cddc88a..3b4f3d5
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/fabric.p4info
@@ -372,145 +372,6 @@
   direct_resource_ids: 302023316
   size: 1024
 }
-tables {
-  preamble {
-    id: 33583029
-    name: "int_egress.int_metadata_insert.int_inst_0003"
-    alias: "int_inst_0003"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0003"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16831286
-  }
-  action_refs {
-    id: 16842664
-  }
-  action_refs {
-    id: 16816733
-  }
-  action_refs {
-    id: 16819517
-  }
-  action_refs {
-    id: 16794056
-  }
-  action_refs {
-    id: 16804966
-  }
-  action_refs {
-    id: 16779523
-  }
-  action_refs {
-    id: 16794789
-  }
-  action_refs {
-    id: 16834584
-  }
-  action_refs {
-    id: 16780654
-  }
-  action_refs {
-    id: 16841202
-  }
-  action_refs {
-    id: 16800429
-  }
-  action_refs {
-    id: 16842176
-  }
-  action_refs {
-    id: 16810248
-  }
-  action_refs {
-    id: 16786933
-  }
-  action_refs {
-    id: 16828419
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33570208
-    name: "int_egress.int_metadata_insert.int_inst_0407"
-    alias: "int_inst_0407"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0407"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16794499
-  }
-  action_refs {
-    id: 16785636
-  }
-  action_refs {
-    id: 16819629
-  }
-  action_refs {
-    id: 16816181
-  }
-  action_refs {
-    id: 16809168
-  }
-  action_refs {
-    id: 16798574
-  }
-  action_refs {
-    id: 16783327
-  }
-  action_refs {
-    id: 16796243
-  }
-  action_refs {
-    id: 16787702
-  }
-  action_refs {
-    id: 16778104
-  }
-  action_refs {
-    id: 16794531
-  }
-  action_refs {
-    id: 16805663
-  }
-  action_refs {
-    id: 16809122
-  }
-  action_refs {
-    id: 16783399
-  }
-  action_refs {
-    id: 16823769
-  }
-  action_refs {
-    id: 16797996
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33604372
-    name: "int_egress.int_prep"
-    alias: "int_prep"
-  }
-  action_refs {
-    id: 16841868
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 1024
-}
 actions {
   preamble {
     id: 16800567
@@ -756,97 +617,6 @@
 }
 actions {
   preamble {
-    id: 16831286
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i0"
-    alias: "int_set_header_0003_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16842664
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i1"
-    alias: "int_set_header_0003_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16816733
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i2"
-    alias: "int_set_header_0003_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16819517
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i3"
-    alias: "int_set_header_0003_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16794056
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i4"
-    alias: "int_set_header_0003_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16804966
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i5"
-    alias: "int_set_header_0003_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16779523
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i6"
-    alias: "int_set_header_0003_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16794789
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i7"
-    alias: "int_set_header_0003_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16834584
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i8"
-    alias: "int_set_header_0003_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16780654
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i9"
-    alias: "int_set_header_0003_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16841202
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i10"
-    alias: "int_set_header_0003_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16800429
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i11"
-    alias: "int_set_header_0003_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16842176
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i12"
-    alias: "int_set_header_0003_i12"
-  }
-}
-actions {
-  preamble {
     id: 16810248
     name: "int_egress.int_metadata_insert.int_set_header_0003_i13"
     alias: "int_set_header_0003_i13"
@@ -854,104 +624,6 @@
 }
 actions {
   preamble {
-    id: 16786933
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i14"
-    alias: "int_set_header_0003_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16828419
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i15"
-    alias: "int_set_header_0003_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16794499
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i0"
-    alias: "int_set_header_0407_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16785636
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i1"
-    alias: "int_set_header_0407_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16819629
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i2"
-    alias: "int_set_header_0407_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16816181
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i3"
-    alias: "int_set_header_0407_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16809168
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i4"
-    alias: "int_set_header_0407_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16798574
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i5"
-    alias: "int_set_header_0407_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16783327
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i6"
-    alias: "int_set_header_0407_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16796243
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i7"
-    alias: "int_set_header_0407_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16787702
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i8"
-    alias: "int_set_header_0407_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16778104
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i9"
-    alias: "int_set_header_0407_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16794531
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i10"
-    alias: "int_set_header_0407_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16805663
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i11"
-    alias: "int_set_header_0407_i11"
-  }
-}
-actions {
-  preamble {
     id: 16809122
     name: "int_egress.int_metadata_insert.int_set_header_0407_i12"
     alias: "int_set_header_0407_i12"
@@ -959,27 +631,6 @@
 }
 actions {
   preamble {
-    id: 16783399
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i13"
-    alias: "int_set_header_0407_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16823769
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i14"
-    alias: "int_set_header_0407_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16797996
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i15"
-    alias: "int_set_header_0407_i15"
-  }
-}
-actions {
-  preamble {
     id: 16796837
     name: "int_egress.int_outer_encap.int_update_ipv4"
     alias: "int_update_ipv4"
@@ -1005,11 +656,6 @@
     name: "int_egress.int_transit"
     alias: "int_transit"
   }
-  params {
-    id: 1
-    name: "switch_id"
-    bitwidth: 32
-  }
 }
 actions {
   preamble {
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/tofino.bin
similarity index 71%
copy from pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin
copy to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/tofino.bin
index 96f5a23..8a036df 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/mavericks/tofino.bin
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int-2/montara/tofino.bin
Binary files differ
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/context.json
deleted file mode 100644
index 40fa6cc..0000000
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/context.json
+++ /dev/null
@@ -1,92967 +0,0 @@
-{
-  "build_date": "03/23/18 21:19:23",
-  "schema_version": "1.3.3",
-  "compiler_version": "6.0.0-alpha.7",
-  "program_name": "main",
-  "learn_quanta": [],
-  "dynamic_hash_calculations": [],
-  "parser": { "ingress": [], "egress": [] },
-  "phv_allocation": [
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 0
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 1
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 2
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 3
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 4
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 5
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 6
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 7
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 8
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 9
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 10
-    },
-    {
-      "ingress": [
-        {
-          "phv_number": 0,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 121,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 1,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 264,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 2,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 299,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 3,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 106,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 4,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 249,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 5,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "spgw_meta.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 6,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 37,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 7,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 386,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 378,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 390,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 382,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 8,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 9,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 373,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 365,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 10,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 139,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 11,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 369,
-              "field_name": "udp.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "udp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 12,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 303,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 13,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 278,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 282,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 274,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 286,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 14,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 15,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 41,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 36,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 56,
-              "field_name": "fabric_metadata.next_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 37,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 60,
-              "field_name": "fabric_metadata.original_ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 38,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 50,
-              "field_name": "fabric_metadata.l4_dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 64,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 127,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 65,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 270,
-              "field_name": "ipv4.ttl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 66,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 172,
-              "field_name": "ig_intr_md_for_dprs.drop_ctl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 2,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 67,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 120,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 68,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 263,
-              "field_name": "ipv4.protocol",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 69,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 49,
-              "field_name": "fabric_metadata.ip_proto",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 70,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 30,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 66,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 103,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 229,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 246,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 71,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 21,
-                  "header_name": "bridged_metadata",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 130,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 149,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 290,
-                  "header_name": "packet_out",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 360,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 72,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 175,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 273,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 315,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 377,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 128,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 291,
-              "field_name": "packet_out.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 173,
-              "field_name": "ig_intr_md_for_tm.ucast_egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 130,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 297,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 131,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 125,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 132,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 268,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 133,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 128,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 118,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 104,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 134,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 271,
-              "field_name": "ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 247,
-              "field_name": "ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 253,
-              "field_name": "ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 135,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 112,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 136,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.flags",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 257,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 137,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 138,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 139,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 25,
-              "field_name": "bridged_metadata.__pad_2",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 295,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 27,
-              "field_name": "bridged_metadata.__pad_3",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 293,
-              "field_name": "spgw.direction",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 47,
-              "field_name": "fabric_metadata.fwd_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 3,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 147,
-              "field_name": "hasExited_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 307,
-              "field_name": "spgw_ingress_hasReturned",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 140,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 31,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 141,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 22,
-              "field_name": "bridged_metadata.__pad_0",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "standard_metadata.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 64,
-              "field_name": "fabric_metadata.pop_vlan_at_egress",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 142,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 154,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 152,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 143,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 54,
-              "field_name": "fabric_metadata.l4_src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 256,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 99,
-              "field_name": "gtpu.version",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu.pt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu.spare",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 27,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 67,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 26,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 87,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 79,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 75,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu.msglen",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 257,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 328,
-              "field_name": "tcp.data_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 340,
-              "field_name": "tcp.res",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 336,
-              "field_name": "tcp.ecn",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 22,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 324,
-              "field_name": "tcp.ctrl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 21,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 356,
-              "field_name": "tcp.window",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 224,
-              "field_name": "int_header.ver",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_header.rep",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 26,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 176,
-              "field_name": "int_header.c",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 25,
-              "phv_lsb": 25,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 180,
-              "field_name": "int_header.e",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 24,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 212,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 21,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 184,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 20,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 204,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 220,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 156,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 160,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 258,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 348,
-              "field_name": "tcp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 332,
-              "field_name": "tcp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 188,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 192,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 196,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 20,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 200,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 19,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 216,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 259,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 320,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 352,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 238,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 234,
-              "field_name": "intl4_shim.len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 242,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 268,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 316,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 269,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 288,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "bridged_metadata.__pad_1",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 228,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 289,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 29,
-              "field_name": "bridged_metadata.bridged_metadata_indicator",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 320,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 150,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 321,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 16,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "egress": [
-        {
-          "phv_number": 16,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 17,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 26,
-              "field_name": "eg_intr_md_from_prsr.global_tstamp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 47,
-              "field_lsb": 32,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 18,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 157,
-              "field_name": "int_egress_tstamp.egress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 19,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 300,
-              "field_name": "spgw.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 20,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 64,
-              "field_name": "gtpu.teid",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 21,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 296,
-              "field_name": "spgw.s1u_sgw_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 22,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 95,
-              "field_name": "gtpu_ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 23,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 292,
-              "field_name": "spgw.s1u_enb_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 24,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 73,
-              "field_name": "gtpu_ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 25,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 185,
-              "field_name": "int_hop_latency.hop_latency",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 26,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 222,
-              "field_name": "int_switch_id.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 27,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 198,
-              "field_name": "int_metadata.switch_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 28,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 79,
-              "field_name": "gtpu_ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 83,
-              "field_name": "gtpu_ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 101,
-              "field_name": "gtpu_ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 91,
-              "field_name": "gtpu_ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 29,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 116,
-              "field_name": "gtpu_udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 110,
-              "field_name": "gtpu_udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 30,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 212,
-              "field_name": "int_q_congestion.q_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 208,
-              "field_name": "int_q_congestion.q_congestion",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 31,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 152,
-              "field_name": "int_egress_port_tx_util.egress_port_tx_util",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 32,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 190,
-              "field_name": "int_ingress_tstamp.ingress_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 33,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 145,
-              "field_name": "ig_intr_md_from_prsr.global_tstamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 80,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 194,
-              "field_name": "int_metadata.ins_cnt_tmp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 81,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 197,
-              "field_name": "int_metadata.int_hdr_word_len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 82,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 229,
-              "field_name": "intl4_shim.len",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 83,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 181,
-              "field_name": "int_header.total_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 84,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 174,
-              "field_name": "int_header.max_hop_cnt",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 85,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 234,
-              "field_name": "ipv4.dscp",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 239,
-              "field_name": "ipv4.ecn",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 86,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 87,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 3,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 88,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 217,
-              "field_name": "int_q_occupancy.q_id",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 89,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 168,
-              "field_name": "int_header.instruction_mask_0003",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 169,
-              "field_name": "int_header.instruction_mask_0407",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 90,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 289,
-              "field_name": "spgw.do_spgw",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 91,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 288,
-              "field_name": "spgw.direction",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 92,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 0,
-                  "header_name": "arp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 32,
-                  "header_name": "ethernet",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 49,
-                  "header_name": "gtpu",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 70,
-                  "header_name": "gtpu_ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 107,
-                  "header_name": "gtpu_udp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 120,
-                  "header_name": "icmp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 226,
-                  "header_name": "intl4_shim",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 93,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 151,
-                  "header_name": "int_egress_port_tx_util",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 156,
-                  "header_name": "int_egress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 161,
-                  "header_name": "int_header",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 184,
-                  "header_name": "int_hop_latency",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 4,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 4,
-                  "position_offset": 189,
-                  "header_name": "int_ingress_tstamp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 5,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 5,
-                  "position_offset": 202,
-                  "header_name": "int_port_ids",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 6,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 6,
-                  "position_offset": 207,
-                  "header_name": "int_q_congestion",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 7,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 7,
-                  "position_offset": 216,
-                  "header_name": "int_q_occupancy",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 94,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 233,
-                  "header_name": "ipv4",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 283,
-                  "header_name": "packet_in",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 304,
-                  "header_name": "tcp",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 3,
-              "phv_lsb": 3,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 3,
-                  "position_offset": 348,
-                  "header_name": "vlan_tag",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 95,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 0,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 0,
-                  "position_offset": 221,
-                  "header_name": "int_switch_id",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 1,
-              "phv_lsb": 1,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 1,
-                  "position_offset": 266,
-                  "header_name": "mpls",
-                  "hidden": false
-                }
-              ]
-            },
-            {
-              "position_offset": 0,
-              "field_name": "POV",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 0,
-              "phv_msb": 2,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": true,
-              "pov_headers": [
-                {
-                  "bit_index": 2,
-                  "position_offset": 335,
-                  "header_name": "udp",
-                  "hidden": false
-                }
-              ]
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 144,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 342,
-              "field_name": "udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 145,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 195,
-              "field_name": "int_metadata.insert_byte_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 146,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 182,
-              "field_name": "int_header.ver",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 175,
-              "field_name": "int_header.rep",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 162,
-              "field_name": "int_header.c",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 164,
-              "field_name": "int_header.e",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 177,
-              "field_name": "int_header.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 5,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 166,
-              "field_name": "int_header.ins_cnt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 4,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 147,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 259,
-              "field_name": "ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 148,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 114,
-              "field_name": "gtpu_udp.len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 149,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 290,
-              "field_name": "spgw.ipv4_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 150,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 99,
-              "field_name": "gtpu_ipv4.total_len",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 151,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 52,
-              "field_name": "gtpu.msglen",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 152,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 24,
-              "field_name": "eg_intr_md.egress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 153,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 203,
-              "field_name": "int_port_ids.egress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 154,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 205,
-              "field_name": "int_port_ids.ingress_port_id",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 155,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 143,
-              "field_name": "ig_intr_md.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 156,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 286,
-              "field_name": "packet_in.ingress_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 7,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 284,
-              "field_name": "packet_in._pad",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 6,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 157,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 336,
-              "field_name": "udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 158,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 68,
-              "field_name": "gtpu.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 13,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 58,
-              "field_name": "gtpu.pt",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 12,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 62,
-              "field_name": "gtpu.spare",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 11,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 50,
-              "field_name": "gtpu.ex_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 10,
-              "phv_lsb": 10,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 60,
-              "field_name": "gtpu.seq_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 9,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 56,
-              "field_name": "gtpu.npdu_flag",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 54,
-              "field_name": "gtpu.msgtype",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 159,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 105,
-              "field_name": "gtpu_ipv4.version",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 89,
-              "field_name": "gtpu_ipv4.ihl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 71,
-              "field_name": "gtpu_ipv4.dscp",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 2,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 77,
-              "field_name": "gtpu_ipv4.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 1,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 160,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 87,
-              "field_name": "gtpu_ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 161,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 108,
-              "field_name": "gtpu_udp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 162,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 21,
-              "field_name": "eg_intr_md.deq_qdepth",
-              "field_msb": 18,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 10,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 163,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 218,
-              "field_name": "int_q_occupancy.q_occupancy",
-              "field_msb": 23,
-              "field_lsb": 8,
-              "field_width": 3,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 260,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 357,
-              "field_name": "vlan_tag.pri",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 349,
-              "field_name": "vlan_tag.cfi",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 28,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 361,
-              "field_name": "vlan_tag.vlan_id",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 27,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 353,
-              "field_name": "vlan_tag.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 261,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 1,
-              "field_name": "arp.hw_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 24,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 13,
-              "field_name": "arp.proto_addr_len",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 23,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 9,
-              "field_name": "arp.opcode",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 240,
-              "field_name": "ipv4.flags",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 29,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 244,
-              "field_name": "ipv4.frag_offset",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 28,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 261,
-              "field_name": "ipv4.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 251,
-              "field_name": "ipv4.protocol",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 262,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 5,
-              "field_name": "arp.hw_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 17,
-              "field_name": "arp.proto_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 271,
-              "field_name": "mpls.label",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 275,
-              "field_name": "mpls.tc",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 267,
-              "field_name": "mpls.bos",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 8,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 279,
-              "field_name": "mpls.ttl",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 263,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 39,
-              "field_name": "ethernet.ether_type",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 264,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 309,
-              "field_name": "tcp.checksum",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 329,
-              "field_name": "tcp.urgent_ptr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 127,
-              "field_name": "icmp.identifier",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 131,
-              "field_name": "icmp.sequence_number",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 265,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 344,
-              "field_name": "udp.src_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 16,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 338,
-              "field_name": "udp.dst_port",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 266,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 267,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 43,
-              "field_name": "ethernet.src_addr",
-              "field_msb": 47,
-              "field_lsb": 16,
-              "field_width": 6,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 272,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 255,
-              "field_name": "ipv4.src_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 273,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 235,
-              "field_name": "ipv4.dst_addr",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 274,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 323,
-              "field_name": "tcp.seq_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 275,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 305,
-              "field_name": "tcp.ack_no",
-              "field_msb": 31,
-              "field_lsb": 0,
-              "field_width": 4,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 135,
-              "field_name": "icmp.timestamp",
-              "field_msb": 63,
-              "field_lsb": 32,
-              "field_width": 8,
-              "phv_msb": 31,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 32
-        },
-        {
-          "phv_number": 292,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 232,
-              "field_name": "intl4_shim.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 293,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 265,
-              "field_name": "ipv4.version",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 7,
-              "phv_lsb": 4,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 250,
-              "field_name": "ipv4.ihl",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 1,
-              "phv_msb": 3,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 294,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 333,
-              "field_name": "tcp.window",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 7,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 8
-        },
-        {
-          "phv_number": 326,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 315,
-              "field_name": "tcp.data_offset",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 321,
-              "field_name": "tcp.res",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 9,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 319,
-              "field_name": "tcp.ecn",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 8,
-              "phv_lsb": 6,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 313,
-              "field_name": "tcp.ctrl",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 5,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 227,
-              "field_name": "intl4_shim.int_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 230,
-              "field_name": "intl4_shim.rsvd1",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 125,
-              "field_name": "icmp.icmp_type",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 123,
-              "field_name": "icmp.icmp_code",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 327,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 33,
-              "field_name": "ethernet.dst_addr",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 6,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 328,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 248,
-              "field_name": "ipv4.identification",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 329,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 317,
-              "field_name": "tcp.dst_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 170,
-              "field_name": "int_header.instruction_mask_0811",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 12,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 172,
-              "field_name": "int_header.instruction_mask_1215",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 11,
-              "phv_lsb": 8,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 179,
-              "field_name": "int_header.rsvd2",
-              "field_msb": 15,
-              "field_lsb": 8,
-              "field_width": 2,
-              "phv_msb": 7,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            },
-            {
-              "position_offset": 121,
-              "field_name": "icmp.checksum",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 330,
-          "container_type": "normal",
-          "records": [
-            {
-              "position_offset": 327,
-              "field_name": "tcp.src_port",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        }
-      ],
-      "stage_number": 11
-    }
-  ],
-  "tables": [
-    {
-      "direction": "ingress",
-      "handle": 16777217,
-      "name": "tbl_act",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 0,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 3 ],
-            "action_format": [
-              {
-                "action_name": "act_0",
-                "action_handle": 536870914,
-                "table_name": "tbl_act_17",
-                "next_table": 0,
-                "next_table_full": 16,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_0",
-          "handle": 536870914,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "hasExited_0" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H11" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870914,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777218,
-      "name": "tbl_act_14",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 1,
-            "default_next_table": 2,
-            "has_attached_gateway": false,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 41
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 3 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 0,
-              "stage_table_type": "ternary_indirection",
-              "size": 512,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 16,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 15,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 126,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 14,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 118,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 13,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 110,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 12,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 102,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 11,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 94,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 10,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 86,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 9,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 78,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 8,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 70,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 7,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 62,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 6,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 54,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 5,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 46,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 4,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 38,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 30,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 22,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 14,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 6,
-                          "field_name": "--padding_6_7--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
-              "action_format": [
-                {
-                  "action_name": "act_14",
-                  "action_handle": 536870915,
-                  "table_name": "tbl_act_32",
-                  "next_table": 0,
-                  "next_table_full": 2,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_0",
-                      "param_type": "constant",
-                      "const_value": 0,
-                      "param_shift": 0,
-                      "dest_start": 4,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_0",
-                      "param_type": "constant",
-                      "const_value": 0,
-                      "param_shift": 0,
-                      "dest_start": 5,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_0",
-                      "param_type": "constant",
-                      "const_value": 0,
-                      "param_shift": 0,
-                      "dest_start": 3,
-                      "dest_width": 1
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "act_14",
-          "handle": 536870915,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B28" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870915,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777219,
-      "name": "tbl_act_15",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_15",
-                "action_handle": 536870916,
-                "table_name": "cond-20",
-                "next_table": 0,
-                "next_table_full": 3,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_15",
-          "handle": 536870916,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.dscp" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B21" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870916,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777220,
-      "name": "tbl_int_egress_int_hop_cnt_increment",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 4,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_hop_cnt_increment",
-                "action_handle": 536870917,
-                "table_name": "tbl_int_egress_int_hop_cnt_exceeded_0",
-                "next_table": 0,
-                "next_table_full": 7,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_hop_cnt_increment",
-          "handle": 536870917,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "int_header.total_hop_cnt" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B19" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870917,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777221,
-      "name": "int_egress.int_prep",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 5,
-            "default_next_table": 6,
-            "has_attached_gateway": false,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 41
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 2 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 0,
-              "stage_table_type": "ternary_indirection",
-              "size": 512,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 2,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 65,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 31,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "--padding_33_63--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 1,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 31,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "--padding_33_63--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
-              "action_format": [
-                {
-                  "action_name": "NoAction",
-                  "action_handle": 536870919,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
-                  "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 68,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "int_egress.int_transit",
-                  "action_handle": 536870918,
-                  "table_name": "int_egress_int_metadata_insert_int_inst_0",
-                  "next_table": 0,
-                  "next_table_full": 6,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 67,
-                  "immediate_fields": [
-                    {
-                      "param_name": "switch_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870919,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_transit",
-          "handle": 536870918,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "switch_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_metadata.switch_id" },
-              "src": [ { "type": "immediate", "name": "switch_id" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operator": "shl",
-              "dst": { "type": "phv", "name": "int_metadata.insert_byte_cnt" },
-              "src": [
-                { "type": "phv", "name": "H18" },
-                { "type": "phv", "name": "H18" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B17" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "B16" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870919,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777222,
-      "name": "int_egress.int_metadata_insert.int_inst_0407",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554433,
-          "name": "int_egress_int_metadata_insert_int_inst_0$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870920,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0407",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0407"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 6,
-            "default_next_table": 17,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0407",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-                "action_handle": 536870920,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-                "action_handle": 536870921,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-                "action_handle": 536870922,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-                "action_handle": 536870923,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_65",
-                    "param_type": "constant",
-                    "const_value": 65,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-                "action_handle": 536870924,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-                "action_handle": 536870925,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-                "action_handle": 536870926,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_66",
-                    "param_type": "constant",
-                    "const_value": 66,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-                "action_handle": 536870927,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_67",
-                    "param_type": "constant",
-                    "const_value": 67,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-                "action_handle": 536870928,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-                "action_handle": 536870929,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-                "action_handle": 536870930,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_80",
-                    "param_type": "constant",
-                    "const_value": 80,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-                "action_handle": 536870931,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_81",
-                    "param_type": "constant",
-                    "const_value": 81,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-                "action_handle": 536870932,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-                "action_handle": 536870933,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-                "action_handle": 536870934,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_82",
-                    "param_type": "constant",
-                    "const_value": 82,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-                "action_handle": 536870935,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_shim_0",
-                "next_table": 0,
-                "next_table_full": 17,
-                "vliw_instruction": 32,
-                "vliw_instruction_full": 96,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 6,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 4,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_83",
-                    "param_type": "constant",
-                    "const_value": 83,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 7
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 0,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 15,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 91,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 21,
-                            "field_name": "--padding_21_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 33554433,
-      "name": "int_egress_int_metadata_insert_int_inst_0$action",
-      "table_type": "action",
-      "size": 4096,
-      "stage_tables": [
-        {
-          "stage_number": 0,
-          "size": 4096,
-          "stage_table_type": "action_data",
-          "logical_table_id": 6,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870920
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870921
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant1"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870922
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870923
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870924
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 30,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870925
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870926
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870927
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870928
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "--padding_1_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870929
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870930
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870931
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 18, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_0--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870932
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 97,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 100,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 104,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 98,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 101,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 65,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 68,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 66,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 69,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 33,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 36,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 34,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 37,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 1,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 19, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "$mask0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 2,
-                      "field_name": "--padding_2_3--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 5,
-                      "field_name": "--padding_5_7--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870933
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant4"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870934
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 120,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 88,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 24,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [
-                        { "dest_start": 0, "value": 16777215, "dest_width": 24 }
-                      ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant5"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870935
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i0",
-          "handle": 536870920,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i1",
-          "handle": 536870921,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_port_tx_util.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i2",
-          "handle": 536870922,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_congestion.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i3",
-          "handle": 536870923,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i4",
-          "handle": 536870924,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_egress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i5",
-          "handle": 536870925,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i6",
-          "handle": 536870926,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i7",
-          "handle": 536870927,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i8",
-          "handle": 536870928,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i9",
-          "handle": 536870929,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i10",
-          "handle": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i11",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i12",
-          "handle": 536870932,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i13",
-          "handle": 536870933,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i14",
-          "handle": 536870934,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0407_i15",
-          "handle": 536870935,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": {
-                "type": "phv",
-                "name": "int_egress_port_tx_util.egress_port_tx_util"
-              },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_ingress_tstamp.ingress_tstamp" },
-              "src": [ { "type": "phv", "name": "W33" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W18" },
-              "src": [
-                { "type": "phv", "name": "W16" },
-                { "type": "phv", "name": "W17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777223,
-      "name": "tbl_int_egress_int_hop_cnt_exceeded",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 0,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 7,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 4 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_hop_cnt_exceeded",
-                "action_handle": 536870936,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 71,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_hop_cnt_exceeded",
-          "handle": 536870936,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_header.e" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H18" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870936,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777224,
-      "name": "tbl_act_0",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 0,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 3 ],
-            "action_format": [
-              {
-                "action_name": "act",
-                "action_handle": 536870937,
-                "table_name": "tbl_act_18",
-                "next_table": 0,
-                "next_table_full": 32,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act",
-          "handle": 536870937,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "phv", "name": "H0" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "hasExited_0" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870937,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777225,
-      "name": "tbl_int_egress_int_outer_encap_int_update_shim",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 2 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_outer_encap.int_update_shim",
-                "action_handle": 536870938,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_udp_0",
-                "next_table": 0,
-                "next_table_full": 18,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_outer_encap.int_update_shim",
-          "handle": 536870938,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "intl4_shim.len" },
-              "src": [
-                { "type": "phv", "name": "B18" },
-                { "type": "phv", "name": "B17" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870938,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777226,
-      "name": "tbl_int_egress_int_outer_encap_int_update_udp",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_outer_encap.int_update_udp",
-                "action_handle": 536870939,
-                "table_name": "tbl_int_egress_int_outer_encap_int_update_ipv4_0",
-                "next_table": 0,
-                "next_table_full": 19,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_outer_encap.int_update_udp",
-          "handle": 536870939,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "udp.len" },
-              "src": [
-                { "type": "phv", "name": "H16" },
-                { "type": "phv", "name": "H17" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "udp.checksum" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870939,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777227,
-      "name": "tbl_int_egress_int_outer_encap_int_update_ipv4",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 3,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_outer_encap.int_update_ipv4",
-                "action_handle": 536870940,
-                "table_name": "int_egress_int_metadata_insert_int_inst",
-                "next_table": 0,
-                "next_table_full": 20,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_outer_encap.int_update_ipv4",
-          "handle": 536870940,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [
-                { "type": "phv", "name": "H19" },
-                { "type": "phv", "name": "H17" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870940,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "egress",
-      "handle": 16777228,
-      "name": "int_egress.int_metadata_insert.int_inst_0003",
-      "table_type": "match",
-      "size": 17,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870941,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "int_header.instruction_mask_0003",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 4,
-          "bit_width_full": 4,
-          "is_valid": false,
-          "instance_name": "int_header",
-          "field_name": "instruction_mask_0003"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1024,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 21,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "int_header.instruction_mask_0003",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-                "action_handle": 536870941,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 3,
-                "vliw_instruction_full": 67,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-                "action_handle": 536870942,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-                "action_handle": 536870949,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 5,
-                "vliw_instruction_full": 69,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-                "action_handle": 536870943,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 6,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-                "action_handle": 536870944,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 8,
-                "vliw_instruction_full": 72,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-                "action_handle": 536870945,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 10,
-                "vliw_instruction_full": 74,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-                "action_handle": 536870946,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 12,
-                "vliw_instruction_full": 76,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-                "action_handle": 536870947,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 14,
-                "vliw_instruction_full": 78,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-                "action_handle": 536870948,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 16,
-                "vliw_instruction_full": 80,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-                "action_handle": 536870950,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 18,
-                "vliw_instruction_full": 82,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-                "action_handle": 536870951,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 20,
-                "vliw_instruction_full": 84,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-                "action_handle": 536870952,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 22,
-                "vliw_instruction_full": 86,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_136",
-                    "param_type": "constant",
-                    "const_value": 136,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-                "action_handle": 536870953,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 24,
-                "vliw_instruction_full": 88,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-                "action_handle": 536870954,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 26,
-                "vliw_instruction_full": 90,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_160",
-                    "param_type": "constant",
-                    "const_value": 160,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-                "action_handle": 536870955,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 28,
-                "vliw_instruction_full": 92,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_40",
-                    "param_type": "constant",
-                    "const_value": 40,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              },
-              {
-                "action_name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-                "action_handle": 536870956,
-                "table_name": "tbl_spgw_egress_gtpu_encap_0",
-                "next_table": 0,
-                "next_table_full": 21,
-                "vliw_instruction": 30,
-                "vliw_instruction_full": 94,
-                "immediate_fields": [
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 7,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 3,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_1",
-                    "param_type": "constant",
-                    "const_value": 1,
-                    "param_shift": 0,
-                    "dest_start": 5,
-                    "dest_width": 1
-                  },
-                  {
-                    "param_name": "constant_168",
-                    "param_type": "constant",
-                    "const_value": 168,
-                    "param_shift": 0,
-                    "dest_start": 8,
-                    "dest_width": 8
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 1,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 6,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 16,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 6,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 90,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 22,
-                            "field_name": "--padding_22_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i0",
-          "handle": 536870941,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i1",
-          "handle": 536870942,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i8",
-          "handle": 536870949,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i2",
-          "handle": 536870943,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i3",
-          "handle": 536870944,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i4",
-          "handle": 536870945,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i5",
-          "handle": 536870946,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i6",
-          "handle": 536870947,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i7",
-          "handle": 536870948,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i9",
-          "handle": 536870950,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i10",
-          "handle": 536870951,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i11",
-          "handle": 536870952,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i12",
-          "handle": 536870953,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_port_ids.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i13",
-          "handle": 536870954,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i14",
-          "handle": 536870955,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "int_egress.int_metadata_insert.int_set_header_0003_i15",
-          "handle": 536870956,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_id" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_hop_latency.hop_latency" },
-              "src": [ { "type": "immediate", "name": "-1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B31" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_switch_id.switch_id" },
-              "src": [ { "type": "phv", "name": "W27" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.0-7" },
-              "src": [ { "type": "phv", "name": "B22" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "int_q_occupancy.q_occupancy.8-23" },
-              "src": [
-                { "type": "phv", "name": "H34" },
-                { "type": "phv", "name": "H35" }
-              ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "B29" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B29" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H25" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H24" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H26" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H27" }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "egress",
-      "handle": 16777229,
-      "name": "tbl_spgw_egress_gtpu_encap",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 5,
-            "default_next_table": 6,
-            "has_attached_gateway": true,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 41
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 5 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 1,
-              "stage_table_type": "ternary_indirection",
-              "size": 512,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 16,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 15,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 121,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 127,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 14,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 113,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 119,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 13,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 105,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 111,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 12,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 103,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 11,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 89,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 95,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 10,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 81,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 87,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 9,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 73,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 79,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 8,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 65,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 71,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 7,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 57,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 63,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 6,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 49,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 55,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 5,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 41,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 47,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 4,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 39,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 25,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 31,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 17,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 23,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 9,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 15,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 1,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 7,
-                          "field_name": "--padding_7_7--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
-              "action_format": [
-                {
-                  "action_name": "spgw_egress.gtpu_encap",
-                  "action_handle": 536870957,
-                  "table_name": "tbl_act_30",
-                  "next_table": 0,
-                  "next_table_full": 22,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 71,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_1",
-                      "param_type": "constant",
-                      "const_value": 1,
-                      "param_shift": 0,
-                      "dest_start": 4,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_1",
-                      "param_type": "constant",
-                      "const_value": 1,
-                      "param_shift": 0,
-                      "dest_start": 5,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_1",
-                      "param_type": "constant",
-                      "const_value": 1,
-                      "param_shift": 0,
-                      "dest_start": 3,
-                      "dest_width": 1
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554434,
-          "name": "tbl_spgw_egress_gtpu_encap_0$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
-              "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870957,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": []
-    },
-    {
-      "direction": "egress",
-      "handle": 33554434,
-      "name": "tbl_spgw_egress_gtpu_encap_0$action",
-      "table_type": "action",
-      "size": 1024,
-      "stage_tables": [
-        {
-          "stage_number": 1,
-          "size": 1024,
-          "stage_table_type": "action_data",
-          "logical_table_id": 5,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 16, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 36, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "$constant4"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$constant10"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 255, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant11"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 45,
-                      "field_name": "$constant5"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 44,
-                      "field_name": "$constant6"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 43,
-                      "field_name": "$constant7"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 42,
-                      "field_name": "$constant8"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "$constant9"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 4, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 60,
-                      "field_name": "$constant12"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 5, "dest_width": 4 } ],
-                      "lsb_mem_word_offset": 56,
-                      "field_name": "$constant13"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 6,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 6 } ],
-                      "lsb_mem_word_offset": 50,
-                      "field_name": "$constant14"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 2,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 2 } ],
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "$constant15"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 93,
-                      "field_name": "$constant16"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 13,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 13 } ],
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "$constant17"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 72,
-                      "field_name": "$constant18"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 17, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant19"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "$constant20"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2152, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant21"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870957
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "spgw_egress.gtpu_encap",
-          "handle": 536870957,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.total_len" },
-              "src": [
-                { "type": "action_param", "name": "$constant4" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.identification" },
-              "src": [ { "immediate": "5395" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W23" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W21" } ]
-            },
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "gtpu_udp.len" },
-              "src": [
-                { "type": "action_param", "name": "$constant3" },
-                { "type": "phv", "name": "H21" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.checksum" },
-              "src": [ { "type": "immediate", "name": "0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.msglen" },
-              "src": [ { "type": "phv", "name": "H21" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu.teid" },
-              "src": [ { "type": "phv", "name": "W19" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B28" },
-              "src": [
-                { "type": "immediate", "name": "$data4" },
-                { "type": "phv", "name": "B28" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H30" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H31" },
-              "src": [ { "type": "action_param", "name": "$data1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W28" },
-              "src": [ { "type": "action_param", "name": "$data2" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W29" },
-              "src": [ { "type": "action_param", "name": "$data3" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "egress",
-      "handle": 16777230,
-      "name": "tbl_act_13",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 1,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 4 ],
-            "action_format": [
-              {
-                "action_name": "act_13",
-                "action_handle": 536870958,
-                "table_name": "--END_OF_PIPELINE--",
-                "next_table": 0,
-                "next_table_full": 255,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 73,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_13",
-          "handle": 536870958,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "packet_in.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B30" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "packet_in.ingress_port" },
-              "src": [
-                { "type": "phv", "name": "H27" },
-                { "type": "phv", "name": "H28" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870958,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777231,
-      "name": "tbl_act_1",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 2,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 0,
-            "default_next_table": 1,
-            "has_attached_gateway": true,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 41
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 2 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 2,
-              "stage_table_type": "ternary_indirection",
-              "size": 512,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 4,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 122,
-                          "field_name": "--padding_26_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 65,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 90,
-                          "field_name": "--padding_26_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 58,
-                          "field_name": "--padding_26_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 1,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 6,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 26,
-                          "field_name": "--padding_26_31--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
-              "action_format": [
-                {
-                  "action_name": "act_4",
-                  "action_handle": 536870959,
-                  "table_name": "tbl_act_19",
-                  "next_table": 0,
-                  "next_table_full": 33,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 65,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_0",
-                      "param_type": "constant",
-                      "const_value": 0,
-                      "param_shift": 0,
-                      "dest_start": 4,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_0",
-                      "param_type": "constant",
-                      "const_value": 0,
-                      "param_shift": 0,
-                      "dest_start": 8,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_272",
-                      "param_type": "constant",
-                      "const_value": 272,
-                      "param_shift": 0,
-                      "dest_start": 16,
-                      "dest_width": 9
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "act_4",
-          "handle": 536870959,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870959,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777232,
-      "name": "tbl_act_2",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 2,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_2",
-                "action_handle": 536870960,
-                "table_name": "spgw_ingress_ue_filter_table",
-                "next_table": 0,
-                "next_table_full": 34,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_2",
-          "handle": 536870960,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.s1u_enb_addr" },
-              "src": [ { "type": "phv", "name": "W1" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw_meta.s1u_sgw_addr" },
-              "src": [ { "type": "phv", "name": "W4" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.total_len" },
-              "src": [ { "type": "phv", "name": "H3" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.identification" },
-              "src": [ { "type": "phv", "name": "H9" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.ttl" },
-              "src": [ { "type": "phv", "name": "B0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.protocol" },
-              "src": [ { "type": "phv", "name": "B3" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.src_addr" },
-              "src": [ { "type": "phv", "name": "W0" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.dst_addr" },
-              "src": [ { "type": "phv", "name": "W3" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ipv4.$valid" },
-              "src": [
-                { "type": "phv", "name": "B6" },
-                { "type": "phv", "name": "B6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "udp.$valid" },
-              "src": [
-                { "type": "phv", "name": "B7" },
-                { "type": "phv", "name": "B7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H6" },
-              "src": [ { "type": "phv", "name": "H5" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "H8" },
-              "src": [ { "type": "phv", "name": "H7" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W9" },
-              "src": [ { "type": "phv", "name": "W8" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W11" },
-              "src": [ { "type": "phv", "name": "W10" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870960,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777233,
-      "name": "spgw_ingress.ue_filter_table",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 2,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
-            "default_next_table": 0,
-            "has_attached_gateway": false,
-            "pack_format": [
-              {
-                "table_word_width": 47,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--version--",
-                        "lsb_mem_word_offset": 43,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "version",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 32
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 9
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [ 0 ], "vpns": [ 0 ] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 0 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 2,
-              "stage_table_type": "ternary_indirection",
-              "size": 32768,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 32,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 31,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 124,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 125,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 30,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 121,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 29,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 116,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 117,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 28,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 113,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 27,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 108,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 109,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 26,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 105,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 25,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 100,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 101,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 24,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 23,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 92,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 93,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 22,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 89,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 21,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 84,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 85,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 20,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 81,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 19,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 76,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 77,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 18,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 73,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 17,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 68,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 69,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 16,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 65,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 15,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 60,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 61,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 14,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 57,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 13,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 52,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 53,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 12,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 49,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 11,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 44,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 45,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 10,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 41,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 9,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 36,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 37,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 8,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 7,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 28,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 29,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 6,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 25,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 5,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 20,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 21,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 4,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 17,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 12,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 13,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 9,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 4,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 5,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 1,
-                          "field_name": "--padding_1_3--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": {
-                "memory_type": "sram",
-                "memory_units_and_vpns": [ { "memory_units": [ 2 ], "vpns": [ 0 ] } ],
-                "spare_bank_memory_unit": 2
-              },
-              "action_format": [
-                {
-                  "action_name": "NoAction",
-                  "action_handle": 536870961,
-                  "table_name": "tbl_act_22",
-                  "next_table": 0,
-                  "next_table_full": 64,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 64,
-                  "immediate_fields": []
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870961,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        }
-      ],
-      "default_action_handle": 536870961,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "ipv4.dst_addr",
-          "position": 0,
-          "match_type": "lpm",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "ipv4",
-          "field_name": "dst_addr"
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777234,
-      "name": "spgw_ingress.s1u_filter_table",
-      "table_type": "match",
-      "size": 3072,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870962,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "spgw_meta.s1u_sgw_addr",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "spgw_meta",
-          "field_name": "s1u_sgw_addr"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 3,
-            "size": 3072,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 1,
-            "default_next_table": 64,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 4,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 5,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 6,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 7,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 8,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 9,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 10,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 11,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "spgw_meta.s1u_sgw_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "NoAction",
-                "action_handle": 536870962,
-                "table_name": "tbl_act_22",
-                "next_table": 0,
-                "next_table_full": 64,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 3,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "--padding_0_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              },
-              {
-                "stage_number": 3,
-                "way_number": 1,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "--padding_0_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 10,
-                  "hash_entry_bit_hi": 19,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 87 ], "vpns": [ 1 ] } ]
-                }
-              },
-              {
-                "stage_number": 3,
-                "way_number": 2,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "spgw_meta.s1u_sgw_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "--padding_0_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 20,
-                  "hash_entry_bit_hi": 29,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 2 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870962,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777235,
-      "name": "tbl_act_3",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 3,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
-            "default_next_table": 0,
-            "has_attached_gateway": false,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 41
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 1 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 3,
-              "stage_table_type": "ternary_indirection",
-              "size": 512,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 4,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 7,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 121,
-                          "field_name": "--padding_25_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 7,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 89,
-                          "field_name": "--padding_25_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 7,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 57,
-                          "field_name": "--padding_25_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 7,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 25,
-                          "field_name": "--padding_25_31--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
-              "action_format": [
-                {
-                  "action_name": "act_1",
-                  "action_handle": 536870963,
-                  "table_name": "tbl_act_22",
-                  "next_table": 0,
-                  "next_table_full": 64,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 65,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_1",
-                      "param_type": "constant",
-                      "const_value": 1,
-                      "param_shift": 0,
-                      "dest_start": 8,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_0",
-                      "param_type": "constant",
-                      "const_value": 0,
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_257",
-                      "param_type": "constant",
-                      "const_value": 257,
-                      "param_shift": 0,
-                      "dest_start": 16,
-                      "dest_width": 9
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "act_1",
-          "handle": 536870963,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870963,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777236,
-      "name": "tbl_act_4",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 3,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 0,
-            "default_next_table": 0,
-            "has_attached_gateway": false,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 41
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 0 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 3,
-              "stage_table_type": "ternary_indirection",
-              "size": 512,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 4,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 7,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 121,
-                          "field_name": "--padding_25_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 7,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 89,
-                          "field_name": "--padding_25_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 7,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 57,
-                          "field_name": "--padding_25_31--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 25,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 7,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 25,
-                          "field_name": "--padding_25_31--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
-              "action_format": [
-                {
-                  "action_name": "act_3",
-                  "action_handle": 536870964,
-                  "table_name": "tbl_act_22",
-                  "next_table": 0,
-                  "next_table_full": 64,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 66,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_1",
-                      "param_type": "constant",
-                      "const_value": 1,
-                      "param_shift": 0,
-                      "dest_start": 8,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_1",
-                      "param_type": "constant",
-                      "const_value": 1,
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_257",
-                      "param_type": "constant",
-                      "const_value": 257,
-                      "param_shift": 0,
-                      "dest_start": 16,
-                      "dest_width": 9
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "act_3",
-          "handle": 536870964,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "bitmasked-set",
-              "dst": { "type": "phv", "name": "H11" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "H11" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870964,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777237,
-      "name": "tbl_act_5",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 4,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 0,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "act_5",
-                "action_handle": 536870965,
-                "table_name": "cond-5",
-                "next_table": 0,
-                "next_table_full": 80,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_5",
-          "handle": 536870965,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw_ingress_hasReturned" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870965,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777238,
-      "name": "spgw_ingress.dl_sess_lookup",
-      "table_type": "match",
-      "size": 3072,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554435,
-          "name": "spgw_ingress_dl_sess_lookup$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870967,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "ipv4.dst_addr",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "ipv4",
-          "field_name": "dst_addr"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 5,
-            "size": 3072,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 1,
-            "default_next_table": 82,
-            "has_attached_gateway": true,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 4,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 5,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 6,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 7,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 8,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 9,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 10,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 11,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "NoAction",
-                "action_handle": 536870967,
-                "table_name": "tbl_spgw_ingress_drop_now_0",
-                "next_table": 0,
-                "next_table_full": 82,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "spgw_ingress.set_dl_sess_info",
-                "action_handle": 536870966,
-                "table_name": "tbl_spgw_ingress_drop_now_0",
-                "next_table": 0,
-                "next_table_full": 82,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
-                "immediate_fields": [
-                  {
-                    "param_name": "s1u_enb_addr",
-                    "param_type": "parameter",
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 32
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 5,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 34,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 48,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              },
-              {
-                "stage_number": 5,
-                "way_number": 1,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 34,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 48,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 10,
-                  "hash_entry_bit_hi": 19,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 87 ], "vpns": [ 1 ] } ]
-                }
-              },
-              {
-                "stage_number": 5,
-                "way_number": 2,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 34,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 48,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 20,
-                  "hash_entry_bit_hi": 29,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 2 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870967,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            { "name": "teid", "start_bit": 0, "position": 0, "bit_width": 32 },
-            {
-              "name": "s1u_enb_addr",
-              "start_bit": 32,
-              "position": 1,
-              "bit_width": 32
-            },
-            {
-              "name": "s1u_sgw_addr",
-              "start_bit": 64,
-              "position": 2,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.teid" },
-              "src": [ { "type": "action_param", "name": "teid" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.s1u_enb_addr" },
-              "src": [ { "type": "immediate", "name": "s1u_enb_addr" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw_meta.s1u_sgw_addr" },
-              "src": [ { "type": "action_param", "name": "s1u_sgw_addr" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 33554435,
-      "name": "spgw_ingress_dl_sess_lookup$action",
-      "table_type": "action",
-      "size": 4096,
-      "stage_tables": [
-        {
-          "stage_number": 5,
-          "size": 4096,
-          "stage_table_type": "action_data",
-          "logical_table_id": 1,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 64,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_63--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 64,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_63--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870967
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "s1u_sgw_addr"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "teid"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "s1u_sgw_addr"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "teid"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870966
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 90 ], "vpns": [ 0 ] },
-              { "memory_units": [ 91 ], "vpns": [ 1 ] }
-            ],
-            "spare_bank_memory_unit": 91
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870967,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "spgw_ingress.set_dl_sess_info",
-          "handle": 536870966,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            { "name": "teid", "start_bit": 0, "position": 0, "bit_width": 32 },
-            {
-              "name": "s1u_enb_addr",
-              "start_bit": 32,
-              "position": 1,
-              "bit_width": 32
-            },
-            {
-              "name": "s1u_sgw_addr",
-              "start_bit": 64,
-              "position": 2,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.teid" },
-              "src": [ { "type": "action_param", "name": "teid" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.s1u_enb_addr" },
-              "src": [ { "type": "immediate", "name": "s1u_enb_addr" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw_meta.s1u_sgw_addr" },
-              "src": [ { "type": "action_param", "name": "s1u_sgw_addr" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777239,
-      "name": "tbl_spgw_ingress_drop_now",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 5,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 2,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "spgw_ingress.drop_now",
-                "action_handle": 536870968,
-                "table_name": "spgw_ingress_ue_cdr_table",
-                "next_table": 0,
-                "next_table_full": 96,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "spgw_ingress.drop_now",
-          "handle": 536870968,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_dprs.drop_ctl" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B2" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "hasExited_0" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H11" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870968,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777240,
-      "name": "spgw_ingress.ue_cdr_table",
-      "table_type": "match",
-      "size": 3072,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108865,
-          "name": "spgw_ingress.ue_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870970,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "ipv4.dst_addr",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "ipv4",
-          "field_name": "dst_addr"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 3072,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 0,
-            "default_next_table": 97,
-            "has_attached_gateway": true,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 4,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 5,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 6,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 7,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 8,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 9,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 10,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 11,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ipv4.dst_addr",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "spgw_ingress.update_ue_cdr",
-                "action_handle": 536870969,
-                "table_name": "tbl_act_23",
-                "next_table": 0,
-                "next_table_full": 97,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "NoAction",
-                "action_handle": 536870970,
-                "table_name": "tbl_act_23",
-                "next_table": 0,
-                "next_table_full": 97,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "result_physical_buses": [ 12 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 6,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 30,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "--padding_2_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 74 ], "vpns": [ 0 ] } ]
-                }
-              },
-              {
-                "stage_number": 6,
-                "way_number": 1,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 30,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "--padding_2_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 10,
-                  "hash_entry_bit_hi": 19,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 75 ], "vpns": [ 1 ] } ]
-                }
-              },
-              {
-                "stage_number": 6,
-                "way_number": 2,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ipv4.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 30,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "--padding_2_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 20,
-                  "hash_entry_bit_hi": 29,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 76 ], "vpns": [ 2 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "spgw_ingress.update_ue_cdr",
-          "handle": 536870969,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "NoAction",
-          "handle": 536870970,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108865,
-      "name": "spgw_ingress.ue_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 6,
-          "size": 4096,
-          "stage_table_type": "statistics",
-          "logical_table_id": 0,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 54 ], "vpns": [ 0 ] },
-              { "memory_units": [ 55 ], "vpns": [ 1 ] },
-              { "memory_units": [ 56 ], "vpns": [ 2 ] }
-            ],
-            "spare_bank_memory_unit": 56
-          },
-          "stats_alu_index": 2
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777241,
-      "name": "tbl_act_6",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_6",
-                "action_handle": 536870971,
-                "table_name": "tbl_spgw_ingress_gtpu_decap_0",
-                "next_table": 0,
-                "next_table_full": 98,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_6",
-          "handle": 536870971,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "spgw.ipv4_len" },
-              "src": [ { "type": "phv", "name": "H4" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870971,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777242,
-      "name": "tbl_spgw_ingress_gtpu_decap",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
-            "default_next_table": 3,
-            "has_attached_gateway": true,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 41
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 3 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 6,
-              "stage_table_type": "ternary_indirection",
-              "size": 512,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 32,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 31,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 124,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 125,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 30,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 121,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 29,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 116,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 117,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 28,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 113,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 27,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 108,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 109,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 26,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 105,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 25,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 100,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 101,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 24,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 97,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 23,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 92,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 93,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 22,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 89,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 21,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 84,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 85,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 20,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 81,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 19,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 76,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 77,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 18,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 73,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 17,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 68,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 69,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 16,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 65,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 15,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 60,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 61,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 14,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 57,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 13,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 52,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 53,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 12,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 49,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 11,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 44,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 45,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 10,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 41,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 9,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 36,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 37,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 8,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 33,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 7,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 28,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 29,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 6,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 25,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 5,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 20,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 21,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 4,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 17,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 12,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 13,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 9,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 4,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 5,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 1,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
-              "action_format": [
-                {
-                  "action_name": "spgw_ingress.gtpu_decap",
-                  "action_handle": 536870972,
-                  "table_name": "filtering_ingress_port_vlan",
-                  "next_table": 0,
-                  "next_table_full": 99,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 66,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_0",
-                      "param_type": "constant",
-                      "const_value": 0,
-                      "param_shift": 0,
-                      "dest_start": 1,
-                      "dest_width": 1
-                    },
-                    {
-                      "param_name": "constant_0",
-                      "param_type": "constant",
-                      "const_value": 0,
-                      "param_shift": 0,
-                      "dest_start": 2,
-                      "dest_width": 1
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "spgw_ingress.gtpu_decap",
-          "handle": 536870972,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "gtpu_udp.$valid" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "B7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "B6" },
-              "src": [
-                { "type": "immediate", "name": "$data0" },
-                { "type": "phv", "name": "B6" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870972,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777243,
-      "name": "filtering.ingress_port_vlan",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 3,
-            "default_next_table": 4,
-            "has_attached_gateway": true,
-            "pack_format": [
-              {
-                "table_word_width": 47,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--version--",
-                        "lsb_mem_word_offset": 43,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "version",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "standard_metadata.ingress_port",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 9
-                      },
-                      {
-                        "field_name": "vlan_tag.vlan_id",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 12
-                      },
-                      {
-                        "field_name": "vlan_tag",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 10,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 7
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 29,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 4
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 34,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 8
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [ 0 ], "vpns": [ 0 ] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 0 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 6,
-              "stage_table_type": "ternary_indirection",
-              "size": 32768,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 32,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 31,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 124,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 127,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 30,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 120,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 123,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 29,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 116,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 119,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 28,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 115,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 27,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 108,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 111,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 26,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 104,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 107,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 25,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 100,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 103,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 24,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 99,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 23,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 92,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 95,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 22,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 88,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 91,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 21,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 84,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 87,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 20,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 83,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 19,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 76,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 79,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 18,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 72,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 75,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 17,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 68,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 71,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 16,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 67,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 15,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 60,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 63,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 14,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 56,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 59,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 13,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 52,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 55,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 12,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 51,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 11,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 44,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 47,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 10,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 40,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 43,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 9,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 36,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 39,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 8,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 35,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 7,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 28,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 31,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 6,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 24,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 27,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 5,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 20,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 23,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 4,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 19,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 12,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 15,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 8,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 11,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 4,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 7,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 3,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 1,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 3,
-                          "field_name": "--padding_3_3--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": {
-                "memory_type": "sram",
-                "memory_units_and_vpns": [ { "memory_units": [ 2 ], "vpns": [ 0 ] } ],
-                "spare_bank_memory_unit": 2
-              },
-              "action_format": [
-                {
-                  "action_name": "nop",
-                  "action_handle": 536870975,
-                  "table_name": "filtering_fwd_classifier",
-                  "next_table": 0,
-                  "next_table_full": 100,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 64,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "filtering.push_internal_vlan",
-                  "action_handle": 536870973,
-                  "table_name": "filtering_fwd_classifier",
-                  "next_table": 0,
-                  "next_table_full": 100,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 67,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "filtering.set_vlan",
-                  "action_handle": 536870974,
-                  "table_name": "filtering_fwd_classifier",
-                  "next_table": 0,
-                  "next_table_full": 100,
-                  "vliw_instruction": 2,
-                  "vliw_instruction_full": 68,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "filtering.drop",
-                  "action_handle": 536870976,
-                  "table_name": "filtering_fwd_classifier",
-                  "next_table": 0,
-                  "next_table_full": 100,
-                  "vliw_instruction": 3,
-                  "vliw_instruction_full": 69,
-                  "immediate_fields": []
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554436,
-          "name": "filtering_ingress_port_vlan$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108866,
-          "name": "filtering.ingress_port_vlan_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "nop",
-          "handle": 536870975,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [
-            {
-              "name": "new_vlan_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 12
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "filtering.set_vlan",
-          "handle": 536870974,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [
-            {
-              "name": "new_vlan_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 12
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
-              "src": [
-                { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "filtering.drop",
-          "handle": 536870976,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_dprs.drop_ctl" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B2" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870975,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "standard_metadata.ingress_port",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 9,
-          "bit_width_full": 9,
-          "is_valid": false,
-          "instance_name": "standard_metadata",
-          "field_name": "ingress_port"
-        },
-        {
-          "name": "vlan_tag",
-          "position": 1,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 1,
-          "bit_width_full": 1,
-          "is_valid": true,
-          "instance_name": "vlan_tag",
-          "field_name": ""
-        },
-        {
-          "name": "vlan_tag.vlan_id",
-          "position": 2,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 12,
-          "bit_width_full": 12,
-          "is_valid": false,
-          "instance_name": "vlan_tag",
-          "field_name": "vlan_id"
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108866,
-      "name": "filtering.ingress_port_vlan_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 6,
-          "size": 2048,
-          "stage_table_type": "statistics",
-          "logical_table_id": 3,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 30 ], "vpns": [ 0 ] },
-              { "memory_units": [ 31 ], "vpns": [ 1 ] }
-            ],
-            "spare_bank_memory_unit": 31
-          },
-          "stats_alu_index": 1
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 33554436,
-      "name": "filtering_ingress_port_vlan$action",
-      "table_type": "action",
-      "size": 2048,
-      "stage_tables": [
-        {
-          "stage_number": 6,
-          "size": 2048,
-          "stage_table_type": "action_data",
-          "logical_table_id": 3,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 64,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_63--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 64,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_63--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870975
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 33024, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 124,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 125,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 12,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "new_vlan_id"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_47--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 33024, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 60,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 61,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 12,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "new_vlan_id"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_47--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870973
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 12,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "new_vlan_id"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 48,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_47--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 124,
-                      "field_name": "--padding_60_63--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 12,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "new_vlan_id"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 48,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_47--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 60,
-                      "field_name": "--padding_60_63--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870974
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 64,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "--padding_0_63--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 64,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_63--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870976
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "nop",
-          "handle": 536870975,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "filtering.push_internal_vlan",
-          "handle": 536870973,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [
-            {
-              "name": "new_vlan_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 12
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "H13" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W7" },
-              "src": [
-                { "type": "action_param", "name": "$data0" },
-                { "type": "phv", "name": "W6" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "filtering.set_vlan",
-          "handle": 536870974,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [
-            {
-              "name": "new_vlan_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 12
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
-              "src": [
-                { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "filtering.drop",
-          "handle": 536870976,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_dprs.drop_ctl" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B2" }
-              ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777244,
-      "name": "filtering.fwd_classifier",
-      "table_type": "match",
-      "size": 3072,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108867,
-          "name": "filtering.fwd_classifier_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870977,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "standard_metadata.ingress_port",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 9,
-          "bit_width_full": 9,
-          "is_valid": false,
-          "instance_name": "standard_metadata",
-          "field_name": "ingress_port"
-        },
-        {
-          "name": "ethernet.dst_addr",
-          "position": 1,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 48,
-          "bit_width_full": 48,
-          "is_valid": false,
-          "instance_name": "ethernet",
-          "field_name": "dst_addr"
-        },
-        {
-          "name": "fabric_metadata.original_ether_type",
-          "position": 2,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 16,
-          "bit_width_full": 16,
-          "is_valid": false,
-          "instance_name": "fabric_metadata",
-          "field_name": "original_ether_type"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 3072,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 4,
-            "default_next_table": 101,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 4,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 5,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 6,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 7,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 8,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 9,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 10,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 11,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 34,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 40,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 38,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 45,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 32,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 33,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 36,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 37,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 42,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 46,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "standard_metadata.ingress_port",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 35,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 39,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 41,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 43,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 44,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 47,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "ethernet.dst_addr",
-                        "hash_match_group": 1,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 3
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "filtering.set_forwarding_type",
-                "action_handle": 536870977,
-                "table_name": "tbl_act_29",
-                "next_table": 0,
-                "next_table_full": 101,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 70,
-                "immediate_fields": [
-                  {
-                    "param_name": "fwd_type",
-                    "param_type": "parameter",
-                    "param_shift": 0,
-                    "dest_start": 1,
-                    "dest_width": 3
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 6,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 89,
-                            "start_bit": 1,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 7
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 8,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 48,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 56,
-                            "start_bit": 32,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 64,
-                            "start_bit": 40,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.original_ether_type",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 72,
-                            "start_bit": 0,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.original_ether_type",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 80,
-                            "start_bit": 8,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 28,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 4,
-                            "field_name": "--padding_4_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 1,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 88,
-                            "field_name": "--padding_88_88--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 16,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 96,
-                            "field_name": "--padding_96_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              },
-              {
-                "stage_number": 6,
-                "way_number": 1,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 89,
-                            "start_bit": 1,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 7
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 8,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 48,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 56,
-                            "start_bit": 32,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 64,
-                            "start_bit": 40,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.original_ether_type",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 72,
-                            "start_bit": 0,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.original_ether_type",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 80,
-                            "start_bit": 8,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 28,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 4,
-                            "field_name": "--padding_4_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 1,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 88,
-                            "field_name": "--padding_88_88--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 16,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 96,
-                            "field_name": "--padding_96_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 10,
-                  "hash_entry_bit_hi": 19,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 87 ], "vpns": [ 1 ] } ]
-                }
-              },
-              {
-                "stage_number": 6,
-                "way_number": 2,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 89,
-                            "start_bit": 1,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 7
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 8,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 48,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 56,
-                            "start_bit": 32,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "ethernet.dst_addr",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 64,
-                            "start_bit": 40,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.original_ether_type",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 72,
-                            "start_bit": 0,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.original_ether_type",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 80,
-                            "start_bit": 8,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 28,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 4,
-                            "field_name": "--padding_4_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 1,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 88,
-                            "field_name": "--padding_88_88--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 16,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 96,
-                            "field_name": "--padding_96_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 20,
-                  "hash_entry_bit_hi": 29,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 2 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "filtering.set_forwarding_type",
-          "handle": 536870977,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [
-            {
-              "name": "fwd_type",
-              "start_bit": 0,
-              "position": 0,
-              "default_value": 0,
-              "bit_width": 3
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.fwd_type" },
-              "src": [
-                { "type": "immediate", "name": "fwd_type" },
-                { "type": "phv", "name": "H11" }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108867,
-      "name": "filtering.fwd_classifier_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 6,
-          "size": 4096,
-          "stage_table_type": "statistics",
-          "logical_table_id": 4,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 78 ], "vpns": [ 0 ] },
-              { "memory_units": [ 79 ], "vpns": [ 1 ] },
-              { "memory_units": [ 80 ], "vpns": [ 2 ] }
-            ],
-            "spare_bank_memory_unit": 80
-          },
-          "stats_alu_index": 3
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777245,
-      "name": "tbl_act_12",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 5,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "act_12",
-                "action_handle": 536870978,
-                "table_name": "tbl_act_27",
-                "next_table": 0,
-                "next_table_full": 102,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_12",
-          "handle": 536870978,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        }
-      ],
-      "default_action_handle": 536870978,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777246,
-      "name": "tbl_act_10",
-      "table_type": "match",
-      "size": 512,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 6,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 6,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 0,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 2 ],
-            "action_format": [
-              {
-                "action_name": "act_10",
-                "action_handle": 536870979,
-                "table_name": "forwarding_bridging",
-                "next_table": 0,
-                "next_table_full": 112,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_10",
-          "handle": 536870979,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        }
-      ],
-      "default_action_handle": 536870979,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": true,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "indirect",
-          "handle": 67108868,
-          "name": "port_counters_control.ingress_port_counter"
-        }
-      ],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108868,
-      "name": "port_counters_control.ingress_port_counter",
-      "table_type": "statistics",
-      "size": 511,
-      "stage_tables": [
-        {
-          "stage_number": 6,
-          "size": 2048,
-          "stage_table_type": "statistics",
-          "logical_table_id": 6,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 6 ], "vpns": [ 0 ] },
-              { "memory_units": [ 7 ], "vpns": [ 1 ] }
-            ],
-            "spare_bank_memory_unit": 7
-          },
-          "stats_alu_index": 0
-        }
-      ],
-      "how_referenced": "indirect",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777247,
-      "name": "forwarding.bridging",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 7,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 0,
-            "default_next_table": 0,
-            "has_attached_gateway": true,
-            "pack_format": [
-              {
-                "table_word_width": 94,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 2,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_payload_1--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--version--",
-                        "lsb_mem_word_offset": 43,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "version",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_parity_1--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 16,
-                        "field_width": 32
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "vlan_tag.vlan_id",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 12
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 41,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 1
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [ 0, 1 ], "vpns": [ 0 ] } ],
-              "spare_bank_memory_unit": 1
-            },
-            "result_physical_buses": [ 2 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 7,
-              "stage_table_type": "ternary_indirection",
-              "size": 2048,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 2,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": {
-                "memory_type": "sram",
-                "memory_units_and_vpns": [ { "memory_units": [ 14 ], "vpns": [ 0 ] } ],
-                "spare_bank_memory_unit": 14
-              },
-              "action_format": [
-                {
-                  "action_name": "NoAction",
-                  "action_handle": 536870981,
-                  "table_name": "forwarding_acl",
-                  "next_table": 0,
-                  "next_table_full": 128,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 65,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870980,
-                  "table_name": "forwarding_acl",
-                  "next_table": 0,
-                  "next_table_full": 128,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108869,
-          "name": "forwarding.bridging_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870981,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "forwarding.set_next_id",
-          "handle": 536870980,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "next_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870981,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "vlan_tag.vlan_id",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 12,
-          "bit_width_full": 12,
-          "is_valid": false,
-          "instance_name": "vlan_tag",
-          "field_name": "vlan_id"
-        },
-        {
-          "name": "ethernet.dst_addr",
-          "position": 1,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 48,
-          "bit_width_full": 48,
-          "is_valid": false,
-          "instance_name": "ethernet",
-          "field_name": "dst_addr"
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108869,
-      "name": "forwarding.bridging_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 7,
-          "size": 2048,
-          "stage_table_type": "statistics",
-          "logical_table_id": 0,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 54 ], "vpns": [ 0 ] },
-              { "memory_units": [ 55 ], "vpns": [ 1 ] }
-            ],
-            "spare_bank_memory_unit": 55
-          },
-          "stats_alu_index": 2
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777248,
-      "name": "forwarding.mpls",
-      "table_type": "match",
-      "size": 3072,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108870,
-          "name": "forwarding.mpls_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870983,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "mpls.label",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 20,
-          "bit_width_full": 20,
-          "is_valid": false,
-          "instance_name": "mpls",
-          "field_name": "label"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 7,
-            "size": 3072,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 1,
-            "default_next_table": 114,
-            "has_attached_gateway": true,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 4,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 5,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 6,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 7,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 8,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 9,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 10,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 11,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "mpls.label",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "NoAction",
-                "action_handle": 536870983,
-                "table_name": "tbl_act_24",
-                "next_table": 0,
-                "next_table_full": 114,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "forwarding.pop_mpls_and_next",
-                "action_handle": 536870982,
-                "table_name": "tbl_act_24",
-                "next_table": 0,
-                "next_table_full": 114,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": [
-                  {
-                    "param_name": "next_id",
-                    "param_type": "parameter",
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 32
-                  }
-                ]
-              }
-            ],
-            "result_physical_buses": [ 14, 12 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 7,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "mpls.label",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 38,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 2
-                          },
-                          {
-                            "field_name": "mpls.label",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 12,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 34,
-                            "field_name": "--padding_34_37--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 64,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              },
-              {
-                "stage_number": 7,
-                "way_number": 1,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "mpls.label",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 38,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 2
-                          },
-                          {
-                            "field_name": "mpls.label",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 12,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 34,
-                            "field_name": "--padding_34_37--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 64,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 10,
-                  "hash_entry_bit_hi": 19,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 87 ], "vpns": [ 1 ] } ]
-                }
-              },
-              {
-                "stage_number": 7,
-                "way_number": 2,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 32,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "immediate",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "immediate",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "mpls.label",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 38,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 2
-                          },
-                          {
-                            "field_name": "mpls.label",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 12,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 34,
-                            "field_name": "--padding_34_37--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 64,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 20,
-                  "hash_entry_bit_hi": 29,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 74 ], "vpns": [ 2 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870983,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "forwarding.pop_mpls_and_next",
-          "handle": 536870982,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "p4_parameters": [
-            {
-              "name": "next_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "mpls.$valid" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108870,
-      "name": "forwarding.mpls_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 7,
-          "size": 4096,
-          "stage_table_type": "statistics",
-          "logical_table_id": 1,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 78 ], "vpns": [ 0 ] },
-              { "memory_units": [ 79 ], "vpns": [ 1 ] },
-              { "memory_units": [ 80 ], "vpns": [ 2 ] }
-            ],
-            "spare_bank_memory_unit": 80
-          },
-          "stats_alu_index": 3
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777249,
-      "name": "tbl_act_7",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 7,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
-            "default_next_table": 0,
-            "has_attached_gateway": false,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 41
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [], "vpns": [] } ],
-              "spare_bank_memory_unit": 0
-            },
-            "result_physical_buses": [ 1 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 7,
-              "stage_table_type": "ternary_indirection",
-              "size": 512,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 8,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 7,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 16,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 112,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 6,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 16,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 96,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 5,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 16,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 80,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 4,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 16,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 3,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 16,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 48,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 2,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 16,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 32,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 16,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 16,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 16,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "immediate"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": { "memory_type": "sram", "memory_units_and_vpns": [] },
-              "action_format": [
-                {
-                  "action_name": "act_7",
-                  "action_handle": 536870984,
-                  "table_name": "forwarding_acl",
-                  "next_table": 0,
-                  "next_table_full": 128,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 67,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_2048",
-                      "param_type": "constant",
-                      "const_value": 2048,
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 16
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554437,
-          "name": "tbl_act_24$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "act_7",
-          "handle": 536870984,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [
-                { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870984,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 33554437,
-      "name": "tbl_act_24$action",
-      "table_type": "action",
-      "size": 4096,
-      "stage_tables": [
-        {
-          "stage_number": 7,
-          "size": 4096,
-          "stage_table_type": "action_data",
-          "logical_table_id": 2,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 128,
-              "entries_per_table_word": 4,
-              "number_memory_units_per_table_word": 1,
-              "entries": [
-                {
-                  "entry_number": 3,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2048, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2048, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 80,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2048, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 2048, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_16_31--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870984
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "act_7",
-          "handle": 536870984,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [
-                { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.original_ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant1" },
-                { "type": "phv", "name": "W37" }
-              ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777250,
-      "name": "forwarding.unicast_v4",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 7,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 3,
-            "default_next_table": 0,
-            "has_attached_gateway": true,
-            "pack_format": [
-              {
-                "table_word_width": 94,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 2,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_payload_1--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--version--",
-                        "lsb_mem_word_offset": 43,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "version",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_parity_1--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 16,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 24,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 9,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 41,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 1
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [ 2, 3 ], "vpns": [ 0 ] } ],
-              "spare_bank_memory_unit": 3
-            },
-            "result_physical_buses": [ 0 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 7,
-              "stage_table_type": "ternary_indirection",
-              "size": 2048,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 2,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": {
-                "memory_type": "sram",
-                "memory_units_and_vpns": [ { "memory_units": [ 2 ], "vpns": [ 0 ] } ],
-                "spare_bank_memory_unit": 2
-              },
-              "action_format": [
-                {
-                  "action_name": "NoAction",
-                  "action_handle": 536870986,
-                  "table_name": "forwarding_acl",
-                  "next_table": 0,
-                  "next_table_full": 128,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 65,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870985,
-                  "table_name": "forwarding_acl",
-                  "next_table": 0,
-                  "next_table_full": 128,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 68,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108871,
-          "name": "forwarding.unicast_v4_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870986,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "forwarding.set_next_id",
-          "handle": 536870985,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "next_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870986,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "ipv4.dst_addr",
-          "position": 0,
-          "match_type": "lpm",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "ipv4",
-          "field_name": "dst_addr"
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108871,
-      "name": "forwarding.unicast_v4_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 7,
-          "size": 2048,
-          "stage_table_type": "statistics",
-          "logical_table_id": 3,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 30 ], "vpns": [ 0 ] },
-              { "memory_units": [ 31 ], "vpns": [ 1 ] }
-            ],
-            "spare_bank_memory_unit": 31
-          },
-          "stats_alu_index": 1
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777251,
-      "name": "forwarding.acl",
-      "table_type": "match",
-      "size": 256,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 8,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 0,
-            "default_next_table": 0,
-            "has_attached_gateway": false,
-            "pack_format": [
-              {
-                "table_word_width": 282,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 6,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "field_name": "--tcam_payload_0--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--version--",
-                        "lsb_mem_word_offset": 43,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "version",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_parity_0--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_payload_1--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_1--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_payload_2--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_2--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_payload_3--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 3,
-                        "msb_mem_word_idx": 3,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_3--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 3,
-                        "msb_mem_word_idx": 3,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_payload_4--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 4,
-                        "msb_mem_word_idx": 4,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_4--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 4,
-                        "msb_mem_word_idx": 4,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "--tcam_payload_5--",
-                        "lsb_mem_word_offset": 0,
-                        "lsb_mem_word_idx": 5,
-                        "msb_mem_word_idx": 5,
-                        "source": "payload",
-                        "start_bit": 0,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "--tcam_parity_5--",
-                        "lsb_mem_word_offset": 45,
-                        "lsb_mem_word_idx": 5,
-                        "msb_mem_word_idx": 5,
-                        "source": "parity",
-                        "start_bit": 0,
-                        "field_width": 2
-                      },
-                      {
-                        "field_name": "ethernet.src_addr",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 5,
-                        "msb_mem_word_idx": 5,
-                        "source": "spec",
-                        "start_bit": 16,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 9,
-                        "lsb_mem_word_idx": 5,
-                        "msb_mem_word_idx": 5,
-                        "source": "spec",
-                        "start_bit": 24,
-                        "field_width": 16
-                      },
-                      {
-                        "field_name": "ethernet.src_addr",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 5,
-                        "msb_mem_word_idx": 5,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "fabric_metadata.l4_dst_port",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 5,
-                        "msb_mem_word_idx": 5,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ethernet.src_addr",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 4,
-                        "msb_mem_word_idx": 4,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ethernet.src_addr",
-                        "lsb_mem_word_offset": 9,
-                        "lsb_mem_word_idx": 4,
-                        "msb_mem_word_idx": 4,
-                        "source": "spec",
-                        "start_bit": 40,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 4,
-                        "msb_mem_word_idx": 4,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ethernet.src_addr",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 4,
-                        "msb_mem_word_idx": 4,
-                        "source": "spec",
-                        "start_bit": 24,
-                        "field_width": 16
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 3,
-                        "msb_mem_word_idx": 3,
-                        "source": "spec",
-                        "start_bit": 24,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 9,
-                        "lsb_mem_word_idx": 3,
-                        "msb_mem_word_idx": 3,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "fabric_metadata.l4_dst_port",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 3,
-                        "msb_mem_word_idx": 3,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 3,
-                        "msb_mem_word_idx": 3,
-                        "source": "spec",
-                        "start_bit": 16,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.src_addr",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 3,
-                        "msb_mem_word_idx": 3,
-                        "source": "spec",
-                        "start_bit": 24,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "fabric_metadata.original_ether_type",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.src_addr",
-                        "lsb_mem_word_offset": 9,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "spec",
-                        "start_bit": 16,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "vlan_tag.vlan_id",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 4
-                      },
-                      {
-                        "field_name": "ipv4.src_addr",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "vlan_tag.vlan_id",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 9,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "standard_metadata.ingress_port",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ipv4.src_addr",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "fabric_metadata.l4_src_port",
-                        "lsb_mem_word_offset": 1,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 16
-                      },
-                      {
-                        "field_name": "icmp.icmp_code",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "icmp.icmp_type",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "fabric_metadata.ip_proto",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "field_name": "standard_metadata.ingress_port",
-                        "lsb_mem_word_offset": 41,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 8,
-                        "field_width": 1
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 41,
-                        "lsb_mem_word_idx": 5,
-                        "msb_mem_word_idx": 5,
-                        "source": "spec",
-                        "start_bit": 16,
-                        "field_width": 4
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 41,
-                        "lsb_mem_word_idx": 4,
-                        "msb_mem_word_idx": 4,
-                        "source": "spec",
-                        "start_bit": 20,
-                        "field_width": 4
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 41,
-                        "lsb_mem_word_idx": 3,
-                        "msb_mem_word_idx": 3,
-                        "source": "spec",
-                        "start_bit": 40,
-                        "field_width": 4
-                      },
-                      {
-                        "field_name": "ethernet.dst_addr",
-                        "lsb_mem_word_offset": 41,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "spec",
-                        "start_bit": 44,
-                        "field_width": 4
-                      },
-                      {
-                        "field_name": "--unused--",
-                        "lsb_mem_word_offset": 41,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "zero",
-                        "start_bit": 0,
-                        "field_width": 1
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [ 0, 1, 2, 3, 4, 5 ], "vpns": [ 0 ] } ],
-              "spare_bank_memory_unit": 5
-            },
-            "result_physical_buses": [ 0 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 8,
-              "stage_table_type": "ternary_indirection",
-              "size": 2048,
-              "pack_format": [
-                {
-                  "memory_word_width": 128,
-                  "table_word_width": 128,
-                  "entries_per_table_word": 2,
-                  "number_memory_units_per_table_word": 1,
-                  "entries": [
-                    {
-                      "entry_number": 1,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 64,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 66,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 98,
-                          "field_name": "--padding_34_63--"
-                        }
-                      ]
-                    },
-                    {
-                      "entry_number": 0,
-                      "fields": [
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 2,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "instr",
-                          "lsb_mem_word_offset": 0,
-                          "field_name": "action"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 32,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "immediate",
-                          "lsb_mem_word_offset": 2,
-                          "field_name": "immediate"
-                        },
-                        {
-                          "start_bit": 0,
-                          "enable_pfe": false,
-                          "field_width": 30,
-                          "lsb_mem_word_idx": 0,
-                          "msb_mem_word_idx": 0,
-                          "source": "zero",
-                          "lsb_mem_word_offset": 34,
-                          "field_name": "--padding_34_63--"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "memory_resource_allocation": {
-                "memory_type": "sram",
-                "memory_units_and_vpns": [ { "memory_units": [ 2 ], "vpns": [ 0 ] } ],
-                "spare_bank_memory_unit": 2
-              },
-              "action_format": [
-                {
-                  "action_name": "nop",
-                  "action_handle": 536870990,
-                  "table_name": "next_simple",
-                  "next_table": 0,
-                  "next_table_full": 144,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 67,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870987,
-                  "table_name": "next_simple",
-                  "next_table": 0,
-                  "next_table_full": 144,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 64,
-                  "immediate_fields": [
-                    {
-                      "param_name": "next_id",
-                      "param_type": "parameter",
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 32
-                    }
-                  ]
-                },
-                {
-                  "action_name": "forwarding.duplicate_to_controller",
-                  "action_handle": 536870988,
-                  "table_name": "next_simple",
-                  "next_table": 0,
-                  "next_table_full": 144,
-                  "vliw_instruction": 2,
-                  "vliw_instruction_full": 65,
-                  "immediate_fields": [
-                    {
-                      "param_name": "constant_192",
-                      "param_type": "constant",
-                      "const_value": 192,
-                      "param_shift": 0,
-                      "dest_start": 0,
-                      "dest_width": 9
-                    }
-                  ]
-                },
-                {
-                  "action_name": "forwarding.drop",
-                  "action_handle": 536870989,
-                  "table_name": "next_simple",
-                  "next_table": 0,
-                  "next_table_full": 144,
-                  "vliw_instruction": 3,
-                  "vliw_instruction_full": 66,
-                  "immediate_fields": []
-                }
-              ]
-            }
-          }
-        ],
-        "match_type": "ternary"
-      },
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108872,
-          "name": "forwarding.acl_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "nop",
-          "handle": 536870990,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        },
-        {
-          "name": "forwarding.set_next_id",
-          "handle": 536870987,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [
-            {
-              "name": "next_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 32
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
-            }
-          ]
-        },
-        {
-          "name": "forwarding.duplicate_to_controller",
-          "handle": 536870988,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "H1" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "forwarding.drop",
-          "handle": 536870989,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "constant_default_action": false,
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_dprs.drop_ctl" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B2" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870990,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "standard_metadata.ingress_port",
-          "position": 0,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 9,
-          "bit_width_full": 9,
-          "is_valid": false,
-          "instance_name": "standard_metadata",
-          "field_name": "ingress_port"
-        },
-        {
-          "name": "fabric_metadata.ip_proto",
-          "position": 1,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 8,
-          "bit_width_full": 8,
-          "is_valid": false,
-          "instance_name": "fabric_metadata",
-          "field_name": "ip_proto"
-        },
-        {
-          "name": "fabric_metadata.l4_src_port",
-          "position": 2,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 16,
-          "bit_width_full": 16,
-          "is_valid": false,
-          "instance_name": "fabric_metadata",
-          "field_name": "l4_src_port"
-        },
-        {
-          "name": "fabric_metadata.l4_dst_port",
-          "position": 3,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 16,
-          "bit_width_full": 16,
-          "is_valid": false,
-          "instance_name": "fabric_metadata",
-          "field_name": "l4_dst_port"
-        },
-        {
-          "name": "fabric_metadata.original_ether_type",
-          "position": 4,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 16,
-          "bit_width_full": 16,
-          "is_valid": false,
-          "instance_name": "fabric_metadata",
-          "field_name": "original_ether_type"
-        },
-        {
-          "name": "ethernet.dst_addr",
-          "position": 5,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 48,
-          "bit_width_full": 48,
-          "is_valid": false,
-          "instance_name": "ethernet",
-          "field_name": "dst_addr"
-        },
-        {
-          "name": "ethernet.src_addr",
-          "position": 6,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 48,
-          "bit_width_full": 48,
-          "is_valid": false,
-          "instance_name": "ethernet",
-          "field_name": "src_addr"
-        },
-        {
-          "name": "vlan_tag.vlan_id",
-          "position": 7,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 12,
-          "bit_width_full": 12,
-          "is_valid": false,
-          "instance_name": "vlan_tag",
-          "field_name": "vlan_id"
-        },
-        {
-          "name": "ipv4.src_addr",
-          "position": 8,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "ipv4",
-          "field_name": "src_addr"
-        },
-        {
-          "name": "ipv4.dst_addr",
-          "position": 9,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "ipv4",
-          "field_name": "dst_addr"
-        },
-        {
-          "name": "icmp.icmp_type",
-          "position": 10,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 8,
-          "bit_width_full": 8,
-          "is_valid": false,
-          "instance_name": "icmp",
-          "field_name": "icmp_type"
-        },
-        {
-          "name": "icmp.icmp_code",
-          "position": 11,
-          "match_type": "ternary",
-          "start_bit": 0,
-          "bit_width": 8,
-          "bit_width_full": 8,
-          "is_valid": false,
-          "instance_name": "icmp",
-          "field_name": "icmp_code"
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108872,
-      "name": "forwarding.acl_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 8,
-          "size": 2048,
-          "stage_table_type": "statistics",
-          "logical_table_id": 0,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 78 ], "vpns": [ 0 ] },
-              { "memory_units": [ 79 ], "vpns": [ 1 ] }
-            ],
-            "spare_bank_memory_unit": 79
-          },
-          "stats_alu_index": 3
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777252,
-      "name": "next.simple",
-      "table_type": "match",
-      "size": 3072,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554438,
-          "name": "next_simple$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108873,
-          "name": "next.simple_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870995,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "fabric_metadata.next_id",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "fabric_metadata",
-          "field_name": "next_id"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 9,
-            "size": 3072,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 0,
-            "default_next_table": 162,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 4,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 5,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 6,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 7,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 8,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 9,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 10,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 11,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "NoAction",
-                "action_handle": 536870995,
-                "table_name": "next_hashed",
-                "next_table": 0,
-                "next_table_full": 162,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "next.output",
-                "action_handle": 536870991,
-                "table_name": "next_hashed",
-                "next_table": 0,
-                "next_table_full": 162,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "next.set_vlan_output",
-                "action_handle": 536870992,
-                "table_name": "next_hashed",
-                "next_table": 0,
-                "next_table_full": 162,
-                "vliw_instruction": 2,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "next.l3_routing",
-                "action_handle": 536870993,
-                "table_name": "next_hashed",
-                "next_table": 0,
-                "next_table_full": 162,
-                "vliw_instruction": 3,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870994,
-                "table_name": "next_hashed",
-                "next_table": 0,
-                "next_table_full": 162,
-                "vliw_instruction": 4,
-                "vliw_instruction_full": 70,
-                "immediate_fields": []
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 9,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 3,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 29,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 3,
-                            "field_name": "--padding_3_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              },
-              {
-                "stage_number": 9,
-                "way_number": 1,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 3,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 29,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 3,
-                            "field_name": "--padding_3_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 10,
-                  "hash_entry_bit_hi": 19,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 87 ], "vpns": [ 1 ] } ]
-                }
-              },
-              {
-                "stage_number": 9,
-                "way_number": 2,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 3,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 29,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 3,
-                            "field_name": "--padding_3_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 20,
-                  "hash_entry_bit_hi": 29,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 2 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870995,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "next.output",
-          "handle": 536870991,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "next.set_vlan_output",
-          "handle": 536870992,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "new_vlan_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 12
-            },
-            {
-              "name": "port_num",
-              "start_bit": 12,
-              "position": 1,
-              "bit_width": 9
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
-              "src": [
-                { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "next.l3_routing",
-          "handle": 536870993,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            }
-          ]
-        },
-        {
-          "name": "next.mpls_routing_v4",
-          "handle": 536870994,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 },
-            {
-              "name": "label",
-              "start_bit": 105,
-              "position": 3,
-              "bit_width": 20
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "mpls.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108873,
-      "name": "next.simple_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 9,
-          "size": 4096,
-          "stage_table_type": "statistics",
-          "logical_table_id": 0,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 78 ], "vpns": [ 0 ] },
-              { "memory_units": [ 79 ], "vpns": [ 1 ] },
-              { "memory_units": [ 80 ], "vpns": [ 2 ] }
-            ],
-            "spare_bank_memory_unit": 80
-          },
-          "stats_alu_index": 3
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 33554438,
-      "name": "next_simple$action",
-      "table_type": "action",
-      "size": 3072,
-      "stage_tables": [
-        {
-          "stage_number": 9,
-          "size": 3072,
-          "stage_table_type": "action_data",
-          "logical_table_id": 0,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 256,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_255--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870995
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_15--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 231,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 25,
-                      "field_name": "--padding_25_255--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870991
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 12,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "new_vlan_id"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding_0_15--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 215,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 25,
-                      "field_name": "--padding_25_239--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 124,
-                      "field_name": "--padding_252_255--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870992
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 7,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 9,
-                      "field_name": "--padding_9_15--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 144,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_32_175--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870993
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 34887, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 20,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 44,
-                      "field_name": "label"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 7,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 9,
-                      "field_name": "--padding_9_15--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 80,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_32_111--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_144_159--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870994
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 89, 90 ], "vpns": [ 0 ] },
-              { "memory_units": [ 81, 91 ], "vpns": [ 2 ] },
-              { "memory_units": [ 82, 92 ], "vpns": [ 4 ] }
-            ],
-            "spare_bank_memory_unit": [ 92, 82 ]
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870995,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "next.output",
-          "handle": 536870991,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "next.set_vlan_output",
-          "handle": 536870992,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "new_vlan_id",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 12
-            },
-            {
-              "name": "port_num",
-              "start_bit": 12,
-              "position": 1,
-              "bit_width": 9
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.vlan_id" },
-              "src": [
-                { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "fabric_metadata.pop_vlan_at_egress" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "H13" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "next.l3_routing",
-          "handle": 536870993,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            }
-          ]
-        },
-        {
-          "name": "next.mpls_routing_v4",
-          "handle": 536870994,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 },
-            {
-              "name": "label",
-              "start_bit": 105,
-              "position": 3,
-              "bit_width": 20
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "mpls.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777253,
-      "name": "tbl_act_8",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 10,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "act_8",
-                "action_handle": 536870996,
-                "table_name": "next_hashed",
-                "next_table": 0,
-                "next_table_full": 162,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_8",
-          "handle": 536870996,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "DirectAluPrimitive",
-              "operation": "add",
-              "dst": { "type": "phv", "name": "ipv4.ttl" },
-              "src": [
-                { "type": "immediate", "name": "255" },
-                { "type": "phv", "name": "B1" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870996,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777254,
-      "name": "next.hashed",
-      "table_type": "match",
-      "size": 3072,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "indirect",
-          "handle": 33554439,
-          "name": "next.ecmp_selector"
-        }
-      ],
-      "selection_table_refs": [
-        {
-          "how_referenced": "indirect",
-          "handle": 50331649,
-          "name": "next.ecmp_selector"
-        }
-      ],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108874,
-          "name": "next.hashed_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "default_selector_mask": 0,
-      "default_selector_value": 0,
-      "default_action_handle": 536871000,
-      "action_profile": "next.ecmp_selector",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [
-        {
-          "name": "fabric_metadata.next_id",
-          "position": 0,
-          "match_type": "exact",
-          "start_bit": 0,
-          "bit_width": 32,
-          "bit_width_full": 32,
-          "is_valid": false,
-          "instance_name": "fabric_metadata",
-          "field_name": "next_id"
-        }
-      ],
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 10,
-            "size": 3072,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 2,
-            "default_next_table": 176,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 4,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 5,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 6,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 7,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 8,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 9,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 10,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 11,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id",
-                        "hash_match_group": 0,
-                        "hash_match_group_bit": 0
-                      }
-                    ]
-                  }
-                ],
-                "hash_function_number": 0
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "NoAction",
-                "action_handle": 536871000,
-                "table_name": "tbl_act_28",
-                "next_table": 0,
-                "next_table_full": 176,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 67,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "next.l3_routing",
-                "action_handle": 536870997,
-                "table_name": "tbl_act_28",
-                "next_table": 0,
-                "next_table_full": 176,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870998,
-                "table_name": "tbl_act_28",
-                "next_table": 0,
-                "next_table_full": 176,
-                "vliw_instruction": 2,
-                "vliw_instruction_full": 66,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "next.mpls_routing_v6",
-                "action_handle": 536870999,
-                "table_name": "tbl_act_28",
-                "next_table": 0,
-                "next_table_full": 176,
-                "vliw_instruction": 3,
-                "vliw_instruction_full": 68,
-                "immediate_fields": []
-              }
-            ],
-            "result_physical_buses": [ 14 ],
-            "pack_format": [
-              {
-                "memory_word_width": 128,
-                "table_word_width": 128,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 1
-              }
-            ],
-            "memory_resource_allocation": null,
-            "ways": [
-              {
-                "stage_number": 10,
-                "way_number": 0,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 7,
-                            "enable_pfe": true,
-                            "field_width": 10,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "sel_ptr",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "meter_addr",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 5,
-                            "enable_pfe": false,
-                            "field_width": 11,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "adt_ptr",
-                            "lsb_mem_word_offset": 13,
-                            "field_name": "action_addr",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 8,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 24,
-                            "field_name": "--padding_24_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 0,
-                  "hash_entry_bit_hi": 9,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 86 ], "vpns": [ 0 ] } ]
-                }
-              },
-              {
-                "stage_number": 10,
-                "way_number": 1,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 7,
-                            "enable_pfe": true,
-                            "field_width": 10,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "sel_ptr",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "meter_addr",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 5,
-                            "enable_pfe": false,
-                            "field_width": 11,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "adt_ptr",
-                            "lsb_mem_word_offset": 13,
-                            "field_name": "action_addr",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 8,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 24,
-                            "field_name": "--padding_24_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 10,
-                  "hash_entry_bit_hi": 19,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 87 ], "vpns": [ 1 ] } ]
-                }
-              },
-              {
-                "stage_number": 10,
-                "way_number": 2,
-                "stage_table_type": "hash_way",
-                "size": 1024,
-                "pack_format": [
-                  {
-                    "memory_word_width": 128,
-                    "table_word_width": 128,
-                    "entries_per_table_word": 1,
-                    "number_memory_units_per_table_word": 1,
-                    "entries": [
-                      {
-                        "entry_number": 0,
-                        "fields": [
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "instr",
-                            "lsb_mem_word_offset": 0,
-                            "field_name": "action",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 4,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "version",
-                            "lsb_mem_word_offset": 112,
-                            "field_name": "version",
-                            "match_mode": "s1q0"
-                          },
-                          {
-                            "start_bit": 7,
-                            "enable_pfe": true,
-                            "field_width": 10,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "sel_ptr",
-                            "lsb_mem_word_offset": 2,
-                            "field_name": "meter_addr",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 5,
-                            "enable_pfe": false,
-                            "field_width": 11,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "adt_ptr",
-                            "lsb_mem_word_offset": 13,
-                            "field_name": "action_addr",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 50,
-                            "start_bit": 10,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 6
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 32,
-                            "start_bit": 16,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "field_name": "fabric_metadata.next_id",
-                            "source": "spec",
-                            "lsb_mem_word_offset": 40,
-                            "start_bit": 24,
-                            "immediate_name": "",
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "match_mode": "unused",
-                            "enable_pfe": false,
-                            "field_width": 8
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 8,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 24,
-                            "field_name": "--padding_24_31--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 2,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 48,
-                            "field_name": "--padding_48_49--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 56,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 56,
-                            "field_name": "--padding_56_111--",
-                            "match_mode": "unused"
-                          },
-                          {
-                            "start_bit": 0,
-                            "enable_pfe": false,
-                            "field_width": 12,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 116,
-                            "field_name": "--padding_116_127--",
-                            "match_mode": "unused"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "memory_resource_allocation": {
-                  "hash_function_id": 0,
-                  "hash_entry_bit_lo": 20,
-                  "hash_entry_bit_hi": 29,
-                  "number_entry_bits": 10,
-                  "hash_select_bit_hi": 40,
-                  "hash_select_bit_lo": 40,
-                  "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 2 ] } ]
-                }
-              }
-            ]
-          }
-        ],
-        "match_type": "exact",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536871000,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "next.l3_routing",
-          "handle": 536870997,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            }
-          ]
-        },
-        {
-          "name": "next.mpls_routing_v4",
-          "handle": 536870998,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 },
-            {
-              "name": "label",
-              "start_bit": 105,
-              "position": 3,
-              "bit_width": 20
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "mpls.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "next.mpls_routing_v6",
-          "handle": 536870999,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 },
-            {
-              "name": "label",
-              "start_bit": 105,
-              "position": 3,
-              "bit_width": 20
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "mpls.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 50331649,
-      "name": "next.ecmp_selector",
-      "table_type": "selection",
-      "size": 1024,
-      "selection_type": "fair",
-      "how_referenced": "indirect",
-      "max_port_pool_size": 120,
-      "bound_to_action_data_table_handle": 33554439,
-      "stage_tables": [
-        {
-          "stage_number": 10,
-          "size": 1024,
-          "stage_table_type": "selection",
-          "logical_table_id": 2,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 91
-          },
-          "meter_alu_index": 3
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 33554439,
-      "name": "next.ecmp_selector",
-      "table_type": "action",
-      "size": 64,
-      "stage_tables": [
-        {
-          "stage_number": 10,
-          "size": 262144,
-          "stage_table_type": "action_data",
-          "logical_table_id": 2,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 256,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "--padding--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536871000
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 7,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 9,
-                      "field_name": "--padding_9_15--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 144,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_32_175--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870997
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 34887, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 20,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 44,
-                      "field_name": "label"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 7,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 9,
-                      "field_name": "--padding_9_15--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 80,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_32_111--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_144_159--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870998
-            },
-            {
-              "memory_word_width": 128,
-              "table_word_width": 256,
-              "entries_per_table_word": 1,
-              "number_memory_units_per_table_word": 2,
-              "entries": [
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 112,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 34887, "dest_width": 16 } ],
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "$constant0"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 3,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 0, "dest_width": 3 } ],
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 1,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 1, "dest_width": 1 } ],
-                      "lsb_mem_word_offset": 40,
-                      "field_name": "$constant2"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 8,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "constant",
-                      "const_tuples": [ { "dest_start": 0, "value": 64, "dest_width": 8 } ],
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "$constant3"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 20,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 44,
-                      "field_name": "label"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "dmac"
-                    },
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "smac"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 7,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 9,
-                      "field_name": "--padding_9_15--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 80,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "--padding_32_111--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 1,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 16,
-                      "field_name": "--padding_144_159--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870999
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 89, 92 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": [ 92, 89 ]
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536871000,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": []
-        },
-        {
-          "name": "next.l3_routing",
-          "handle": 536870997,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            }
-          ]
-        },
-        {
-          "name": "next.mpls_routing_v4",
-          "handle": 536870998,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 },
-            {
-              "name": "label",
-              "start_bit": 105,
-              "position": 3,
-              "bit_width": 20
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "mpls.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        },
-        {
-          "name": "next.mpls_routing_v6",
-          "handle": 536870999,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            {
-              "name": "port_num",
-              "start_bit": 0,
-              "position": 0,
-              "bit_width": 9
-            },
-            { "name": "smac", "start_bit": 9, "position": 1, "bit_width": 48 },
-            { "name": "dmac", "start_bit": 57, "position": 2, "bit_width": 48 },
-            {
-              "name": "label",
-              "start_bit": 105,
-              "position": 3,
-              "bit_width": 20
-            }
-          ],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
-              "src": [
-                { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "mpls.$valid" },
-              "src": [
-                { "type": "immediate", "name": "1" },
-                { "type": "phv", "name": "B8" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [
-                { "type": "action_param", "name": "$constant0" },
-                { "type": "phv", "name": "W7" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.0-15" },
-              "src": [ { "type": "action_param", "name": "dmac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [
-                { "type": "action_param", "name": "smac.0-15" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.dst_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "dmac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "W13" },
-              "src": [ { "type": "action_param", "name": "$data0" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "indirect"
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108874,
-      "name": "next.hashed_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 10,
-          "size": 4096,
-          "stage_table_type": "statistics",
-          "logical_table_id": 2,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 78 ], "vpns": [ 0 ] },
-              { "memory_units": [ 79 ], "vpns": [ 1 ] },
-              { "memory_units": [ 80 ], "vpns": [ 2 ] }
-            ],
-            "spare_bank_memory_unit": 80
-          },
-          "stats_alu_index": 3
-        }
-      ],
-      "how_referenced": "direct",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777255,
-      "name": "tbl_act_11",
-      "table_type": "match",
-      "size": 1,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 11,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 0,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 0 ],
-            "action_format": [
-              {
-                "action_name": "act_11",
-                "action_handle": 536871001,
-                "table_name": "tbl_act_26",
-                "next_table": 0,
-                "next_table_full": 177,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 64,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_11",
-          "handle": 536871001,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": [
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "ethernet.ether_type" },
-              "src": [
-                { "type": "phv", "name": "W7" },
-                { "type": "phv", "name": "W6" }
-              ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dst": { "type": "phv", "name": "vlan_tag.$valid" },
-              "src": [
-                { "type": "immediate", "name": "0" },
-                { "type": "phv", "name": "B8" }
-              ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536871001,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": false,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777256,
-      "name": "tbl_act_9",
-      "table_type": "match",
-      "size": 512,
-      "preferred_match_type": "exact",
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 11,
-            "size": 1,
-            "stage_table_type": "match_with_no_key",
-            "logical_table_id": 1,
-            "default_next_table": 255,
-            "has_attached_gateway": true,
-            "memory_resource_allocation": null,
-            "pack_format": [
-              {
-                "table_word_width": 0,
-                "memory_word_width": 0,
-                "entries_per_table_word": 0,
-                "number_memory_units_per_table_word": 0
-              }
-            ],
-            "result_physical_buses": [ 1 ],
-            "action_format": [
-              {
-                "action_name": "act_9",
-                "action_handle": 536871002,
-                "table_name": "--END_OF_PIPELINE--",
-                "next_table": 0,
-                "next_table_full": 255,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              }
-            ],
-            "hash_functions": []
-          }
-        ],
-        "match_type": "match_with_no_key",
-        "uses_dynamic_key_masks": false
-      },
-      "actions": [
-        {
-          "name": "act_9",
-          "handle": 536871002,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "constant_default_action": false,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [],
-          "override_meter_addr": false,
-          "override_meter_addr_pfe": false,
-          "override_meter_full_addr": 0,
-          "override_stat_addr": false,
-          "override_stat_addr_pfe": false,
-          "override_stat_full_addr": 0,
-          "override_stateful_addr": false,
-          "override_stateful_addr_pfe": false,
-          "override_stateful_full_addr": 0,
-          "is_action_meter_color_aware": false,
-          "primitives": []
-        }
-      ],
-      "default_action_handle": 536871002,
-      "action_profile": "",
-      "default_next_table_mask": 0,
-      "ap_bind_indirect_res_to_match": [],
-      "is_resource_controllable": true,
-      "uses_range": false,
-      "match_key_fields": [],
-      "performs_hash_action": true,
-      "action_data_table_refs": [],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "indirect",
-          "handle": 67108875,
-          "name": "port_counters_control.egress_port_counter"
-        }
-      ],
-      "stateful_table_refs": []
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108875,
-      "name": "port_counters_control.egress_port_counter",
-      "table_type": "statistics",
-      "size": 511,
-      "stage_tables": [
-        {
-          "stage_number": 11,
-          "size": 2048,
-          "stage_table_type": "statistics",
-          "logical_table_id": 1,
-          "default_next_table": 255,
-          "pack_format": [
-            {
-              "table_word_width": 128,
-              "memory_word_width": 128,
-              "entries_per_table_word": 2,
-              "number_memory_units_per_table_word": 1
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [
-              { "memory_units": [ 78 ], "vpns": [ 0 ] },
-              { "memory_units": [ 79 ], "vpns": [ 1 ] }
-            ],
-            "spare_bank_memory_unit": 79
-          },
-          "stats_alu_index": 3
-        }
-      ],
-      "how_referenced": "indirect",
-      "enable_pfe": false,
-      "pfe_bit_position": 0,
-      "byte_counter_resolution": 36,
-      "packet_counter_resolution": 28,
-      "statistics_type": "packets_and_bytes"
-    }
-  ],
-  "configuration_cache": [
-    {
-      "fully_qualified_name": "pmarb.ebp18_reg.ebp_reg[0].epb_prsr_port_regs.chnl_ctrl[0]",
-      "name": "parser0_chnl_ctrl_0",
-      "value": "00a41fff"
-    },
-    {
-      "fully_qualified_name": "pmarb.ebp18_reg.ebp_reg[0].epb_prsr_port_regs.chnl_ctrl[1]",
-      "name": "parser0_chnl_ctrl_1",
-      "value": "00a41fff"
-    },
-    {
-      "fully_qualified_name": "pmarb.ebp18_reg.ebp_reg[0].epb_prsr_port_regs.chnl_ctrl[2]",
-      "name": "parser0_chnl_ctrl_2",
-      "value": "00a41fff"
-    },
-    {
-      "fully_qualified_name": "pmarb.ebp18_reg.ebp_reg[0].epb_prsr_port_regs.chnl_ctrl[3]",
-      "name": "parser0_chnl_ctrl_3",
-      "value": "00a41fff"
-    },
-    {
-      "fully_qualified_name": "pmarb.ebp18_reg.ebp_reg[0].epb_prsr_port_regs.multi_threading",
-      "name": "parser0_multi_threading",
-      "value": "19522020"
-    },
-    {
-      "fully_qualified_name": "mau[0].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_0_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000001800000022000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[0].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_0_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[1].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_1_match_input_xbar_din_power_ctl",
-      "value": "00000000000000000000000000000000000000800000000000000000000000de000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[1].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_1_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[2].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_2_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[3].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_3_match_input_xbar_din_power_ctl",
-      "value": "0000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[3].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_3_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[4].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_4_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[5].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_5_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[5].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_5_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[6].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_6_match_input_xbar_din_power_ctl",
-      "value": "0000009000000040000000000000000000000000000000010000000000000000000000000000003800000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[6].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_6_parity_group_mask",
-      "value": "00000001000000000000000c00000000000000020000000000000004000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[7].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_7_match_input_xbar_din_power_ctl",
-      "value": "0000009000000060000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[7].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_7_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[8].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_8_match_input_xbar_din_power_ctl",
-      "value": "000000d2000000c000000000000000000000002000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[9].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_9_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[9].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_9_parity_group_mask",
-      "value": "00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[10].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_10_match_input_xbar_din_power_ctl",
-      "value": "0000001200000000000000000000000000000060000000010000000000000000000000000000008000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[10].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_10_parity_group_mask",
-      "value": "00000001000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[11].dp.match_input_xbar_din_power_ctl",
-      "name": "stage_11_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000000000000000000000000000000000000020000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "fully_qualified_name": "mau[11].dp.xbar_hash.hash.parity_group_mask",
-      "name": "stage_11_parity_group_mask",
-      "value": "00000001000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    }
-  ]
-}
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/fabric.p4info
deleted file mode 100644
index cddc88a..0000000
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/fabric.p4info
+++ /dev/null
@@ -1,1200 +0,0 @@
-tables {
-  preamble {
-    id: 33618733
-    name: "spgw_ingress.ue_filter_table"
-    alias: "ue_filter_table"
-  }
-  match_fields {
-    id: 1
-    name: "ipv4.dst_addr"
-    bitwidth: 32
-    match_type: LPM
-  }
-  action_refs {
-    id: 16800567
-  }
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33615906
-    name: "spgw_ingress.s1u_filter_table"
-    alias: "s1u_filter_table"
-  }
-  match_fields {
-    id: 1
-    name: "spgw_meta.s1u_sgw_addr"
-    bitwidth: 32
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16800567
-  }
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33582731
-    name: "spgw_ingress.dl_sess_lookup"
-    alias: "dl_sess_lookup"
-  }
-  match_fields {
-    id: 1
-    name: "ipv4.dst_addr"
-    bitwidth: 32
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16804065
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33611263
-    name: "spgw_ingress.ue_cdr_table"
-    alias: "ue_cdr_table"
-  }
-  match_fields {
-    id: 1
-    name: "ipv4.dst_addr"
-    bitwidth: 32
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16818129
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  direct_resource_ids: 302004306
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33611649
-    name: "filtering.ingress_port_vlan"
-    alias: "ingress_port_vlan"
-  }
-  match_fields {
-    id: 1
-    name: "standard_metadata.ingress_port"
-    bitwidth: 9
-    match_type: EXACT
-  }
-  match_fields {
-    id: 2
-    name: "hdr.vlan_tag.is_valid"
-    bitwidth: 1
-    match_type: EXACT
-  }
-  match_fields {
-    id: 3
-    name: "hdr.vlan_tag.vlan_id"
-    bitwidth: 12
-    match_type: TERNARY
-  }
-  action_refs {
-    id: 16835546
-  }
-  action_refs {
-    id: 16793253
-  }
-  action_refs {
-    id: 16819938
-  }
-  action_refs {
-    id: 16798734
-  }
-  const_default_action_id: 16819938
-  direct_resource_ids: 302038285
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33596298
-    name: "filtering.fwd_classifier"
-    alias: "fwd_classifier"
-  }
-  match_fields {
-    id: 1
-    name: "standard_metadata.ingress_port"
-    bitwidth: 9
-    match_type: EXACT
-  }
-  match_fields {
-    id: 2
-    name: "hdr.ethernet.dst_addr"
-    bitwidth: 48
-    match_type: EXACT
-  }
-  match_fields {
-    id: 3
-    name: "fabric_metadata.original_ether_type"
-    bitwidth: 16
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16840921
-  }
-  const_default_action_id: 16840921
-  direct_resource_ids: 302050110
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33596749
-    name: "forwarding.bridging"
-    alias: "bridging"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.vlan_tag.vlan_id"
-    bitwidth: 12
-    match_type: EXACT
-  }
-  match_fields {
-    id: 2
-    name: "hdr.ethernet.dst_addr"
-    bitwidth: 48
-    match_type: TERNARY
-  }
-  action_refs {
-    id: 16839692
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  direct_resource_ids: 301993073
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33574274
-    name: "forwarding.mpls"
-    alias: "mpls"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.mpls.label"
-    bitwidth: 20
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16827758
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  direct_resource_ids: 302053291
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33586372
-    name: "forwarding.unicast_v4"
-    alias: "unicast_v4"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.ipv4.dst_addr"
-    bitwidth: 32
-    match_type: LPM
-  }
-  action_refs {
-    id: 16839692
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  direct_resource_ids: 301991276
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33574876
-    name: "forwarding.acl"
-    alias: "acl"
-  }
-  match_fields {
-    id: 1
-    name: "standard_metadata.ingress_port"
-    bitwidth: 9
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 2
-    name: "fabric_metadata.ip_proto"
-    bitwidth: 8
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 3
-    name: "fabric_metadata.l4_src_port"
-    bitwidth: 16
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 4
-    name: "fabric_metadata.l4_dst_port"
-    bitwidth: 16
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 5
-    name: "fabric_metadata.original_ether_type"
-    bitwidth: 16
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 6
-    name: "hdr.ethernet.dst_addr"
-    bitwidth: 48
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 7
-    name: "hdr.ethernet.src_addr"
-    bitwidth: 48
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 8
-    name: "hdr.vlan_tag.vlan_id"
-    bitwidth: 12
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 9
-    name: "hdr.ipv4.src_addr"
-    bitwidth: 32
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 10
-    name: "hdr.ipv4.dst_addr"
-    bitwidth: 32
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 11
-    name: "hdr.icmp.icmp_type"
-    bitwidth: 8
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 12
-    name: "hdr.icmp.icmp_code"
-    bitwidth: 8
-    match_type: TERNARY
-  }
-  action_refs {
-    id: 16839692
-  }
-  action_refs {
-    id: 16801739
-  }
-  action_refs {
-    id: 16833260
-  }
-  action_refs {
-    id: 16819938
-  }
-  const_default_action_id: 16819938
-  direct_resource_ids: 301995056
-  size: 256
-}
-tables {
-  preamble {
-    id: 33571723
-    name: "next.simple"
-    alias: "simple"
-  }
-  match_fields {
-    id: 1
-    name: "fabric_metadata.next_id"
-    bitwidth: 32
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16832750
-  }
-  action_refs {
-    id: 16808391
-  }
-  action_refs {
-    id: 16812135
-  }
-  action_refs {
-    id: 16780811
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  direct_resource_ids: 301991880
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33608588
-    name: "next.hashed"
-    alias: "hashed"
-  }
-  match_fields {
-    id: 1
-    name: "fabric_metadata.next_id"
-    bitwidth: 32
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16812135
-  }
-  action_refs {
-    id: 16780811
-  }
-  action_refs {
-    id: 16827088
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  implementation_id: 285233747
-  direct_resource_ids: 302023316
-  size: 1024
-}
-tables {
-  preamble {
-    id: 33583029
-    name: "int_egress.int_metadata_insert.int_inst_0003"
-    alias: "int_inst_0003"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0003"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16831286
-  }
-  action_refs {
-    id: 16842664
-  }
-  action_refs {
-    id: 16816733
-  }
-  action_refs {
-    id: 16819517
-  }
-  action_refs {
-    id: 16794056
-  }
-  action_refs {
-    id: 16804966
-  }
-  action_refs {
-    id: 16779523
-  }
-  action_refs {
-    id: 16794789
-  }
-  action_refs {
-    id: 16834584
-  }
-  action_refs {
-    id: 16780654
-  }
-  action_refs {
-    id: 16841202
-  }
-  action_refs {
-    id: 16800429
-  }
-  action_refs {
-    id: 16842176
-  }
-  action_refs {
-    id: 16810248
-  }
-  action_refs {
-    id: 16786933
-  }
-  action_refs {
-    id: 16828419
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33570208
-    name: "int_egress.int_metadata_insert.int_inst_0407"
-    alias: "int_inst_0407"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0407"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16794499
-  }
-  action_refs {
-    id: 16785636
-  }
-  action_refs {
-    id: 16819629
-  }
-  action_refs {
-    id: 16816181
-  }
-  action_refs {
-    id: 16809168
-  }
-  action_refs {
-    id: 16798574
-  }
-  action_refs {
-    id: 16783327
-  }
-  action_refs {
-    id: 16796243
-  }
-  action_refs {
-    id: 16787702
-  }
-  action_refs {
-    id: 16778104
-  }
-  action_refs {
-    id: 16794531
-  }
-  action_refs {
-    id: 16805663
-  }
-  action_refs {
-    id: 16809122
-  }
-  action_refs {
-    id: 16783399
-  }
-  action_refs {
-    id: 16823769
-  }
-  action_refs {
-    id: 16797996
-  }
-  size: 17
-}
-tables {
-  preamble {
-    id: 33604372
-    name: "int_egress.int_prep"
-    alias: "int_prep"
-  }
-  action_refs {
-    id: 16841868
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 1024
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
-  }
-}
-actions {
-  preamble {
-    id: 16819938
-    name: "nop"
-    alias: "nop"
-  }
-}
-actions {
-  preamble {
-    id: 16820193
-    name: "spgw_ingress.drop_now"
-    alias: "drop_now"
-  }
-}
-actions {
-  preamble {
-    id: 16819909
-    name: "spgw_ingress.gtpu_decap"
-    alias: "gtpu_decap"
-  }
-}
-actions {
-  preamble {
-    id: 16804065
-    name: "spgw_ingress.set_dl_sess_info"
-    alias: "set_dl_sess_info"
-  }
-  params {
-    id: 1
-    name: "teid"
-    bitwidth: 32
-  }
-  params {
-    id: 2
-    name: "s1u_enb_addr"
-    bitwidth: 32
-  }
-  params {
-    id: 3
-    name: "s1u_sgw_addr"
-    bitwidth: 32
-  }
-}
-actions {
-  preamble {
-    id: 16818129
-    name: "spgw_ingress.update_ue_cdr"
-    alias: "update_ue_cdr"
-  }
-}
-actions {
-  preamble {
-    id: 16798734
-    name: "filtering.drop"
-    alias: "filtering.drop"
-  }
-}
-actions {
-  preamble {
-    id: 16793253
-    name: "filtering.set_vlan"
-    alias: "set_vlan"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16835546
-    name: "filtering.push_internal_vlan"
-    alias: "push_internal_vlan"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16840921
-    name: "filtering.set_forwarding_type"
-    alias: "set_forwarding_type"
-  }
-  params {
-    id: 1
-    name: "fwd_type"
-    bitwidth: 3
-  }
-}
-actions {
-  preamble {
-    id: 16833260
-    name: "forwarding.drop"
-    alias: "forwarding.drop"
-  }
-}
-actions {
-  preamble {
-    id: 16839692
-    name: "forwarding.set_next_id"
-    alias: "set_next_id"
-  }
-  params {
-    id: 1
-    name: "next_id"
-    bitwidth: 32
-  }
-}
-actions {
-  preamble {
-    id: 16827758
-    name: "forwarding.pop_mpls_and_next"
-    alias: "pop_mpls_and_next"
-  }
-  params {
-    id: 1
-    name: "next_id"
-    bitwidth: 32
-  }
-}
-actions {
-  preamble {
-    id: 16801739
-    name: "forwarding.duplicate_to_controller"
-    alias: "duplicate_to_controller"
-  }
-}
-actions {
-  preamble {
-    id: 16832750
-    name: "next.output"
-    alias: "output"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-}
-actions {
-  preamble {
-    id: 16808391
-    name: "next.set_vlan_output"
-    alias: "set_vlan_output"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-  params {
-    id: 2
-    name: "port_num"
-    bitwidth: 9
-  }
-}
-actions {
-  preamble {
-    id: 16812135
-    name: "next.l3_routing"
-    alias: "l3_routing"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-}
-actions {
-  preamble {
-    id: 16780811
-    name: "next.mpls_routing_v4"
-    alias: "mpls_routing_v4"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16827088
-    name: "next.mpls_routing_v6"
-    alias: "mpls_routing_v6"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16831286
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i0"
-    alias: "int_set_header_0003_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16842664
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i1"
-    alias: "int_set_header_0003_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16816733
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i2"
-    alias: "int_set_header_0003_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16819517
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i3"
-    alias: "int_set_header_0003_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16794056
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i4"
-    alias: "int_set_header_0003_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16804966
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i5"
-    alias: "int_set_header_0003_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16779523
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i6"
-    alias: "int_set_header_0003_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16794789
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i7"
-    alias: "int_set_header_0003_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16834584
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i8"
-    alias: "int_set_header_0003_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16780654
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i9"
-    alias: "int_set_header_0003_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16841202
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i10"
-    alias: "int_set_header_0003_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16800429
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i11"
-    alias: "int_set_header_0003_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16842176
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i12"
-    alias: "int_set_header_0003_i12"
-  }
-}
-actions {
-  preamble {
-    id: 16810248
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i13"
-    alias: "int_set_header_0003_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16786933
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i14"
-    alias: "int_set_header_0003_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16828419
-    name: "int_egress.int_metadata_insert.int_set_header_0003_i15"
-    alias: "int_set_header_0003_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16794499
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i0"
-    alias: "int_set_header_0407_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16785636
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i1"
-    alias: "int_set_header_0407_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16819629
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i2"
-    alias: "int_set_header_0407_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16816181
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i3"
-    alias: "int_set_header_0407_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16809168
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i4"
-    alias: "int_set_header_0407_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16798574
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i5"
-    alias: "int_set_header_0407_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16783327
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i6"
-    alias: "int_set_header_0407_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16796243
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i7"
-    alias: "int_set_header_0407_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16787702
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i8"
-    alias: "int_set_header_0407_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16778104
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i9"
-    alias: "int_set_header_0407_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16794531
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i10"
-    alias: "int_set_header_0407_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16805663
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i11"
-    alias: "int_set_header_0407_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16809122
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i12"
-    alias: "int_set_header_0407_i12"
-  }
-}
-actions {
-  preamble {
-    id: 16783399
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i13"
-    alias: "int_set_header_0407_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16823769
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i14"
-    alias: "int_set_header_0407_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16797996
-    name: "int_egress.int_metadata_insert.int_set_header_0407_i15"
-    alias: "int_set_header_0407_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16796837
-    name: "int_egress.int_outer_encap.int_update_ipv4"
-    alias: "int_update_ipv4"
-  }
-}
-actions {
-  preamble {
-    id: 16818157
-    name: "int_egress.int_outer_encap.int_update_udp"
-    alias: "int_update_udp"
-  }
-}
-actions {
-  preamble {
-    id: 16778910
-    name: "int_egress.int_outer_encap.int_update_shim"
-    alias: "int_update_shim"
-  }
-}
-actions {
-  preamble {
-    id: 16841868
-    name: "int_egress.int_transit"
-    alias: "int_transit"
-  }
-  params {
-    id: 1
-    name: "switch_id"
-    bitwidth: 32
-  }
-}
-actions {
-  preamble {
-    id: 16779586
-    name: "int_egress.int_hop_cnt_increment"
-    alias: "int_hop_cnt_increment"
-  }
-}
-actions {
-  preamble {
-    id: 16809836
-    name: "int_egress.int_hop_cnt_exceeded"
-    alias: "int_hop_cnt_exceeded"
-  }
-}
-actions {
-  preamble {
-    id: 16829135
-    name: "spgw_egress.gtpu_encap"
-    alias: "gtpu_encap"
-  }
-}
-action_profiles {
-  preamble {
-    id: 285233747
-    name: "next.ecmp_selector"
-    alias: "ecmp_selector"
-  }
-  table_ids: 33608588
-  with_selector: true
-  size: 64
-}
-counters {
-  preamble {
-    id: 302011205
-    name: "port_counters_control.egress_port_counter"
-    alias: "egress_port_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  size: 511
-}
-counters {
-  preamble {
-    id: 302002771
-    name: "port_counters_control.ingress_port_counter"
-    alias: "ingress_port_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  size: 511
-}
-direct_counters {
-  preamble {
-    id: 302004306
-    name: "spgw_ingress.ue_counter"
-    alias: "ue_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33611263
-}
-direct_counters {
-  preamble {
-    id: 302038285
-    name: "filtering.ingress_port_vlan_counter"
-    alias: "ingress_port_vlan_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33611649
-}
-direct_counters {
-  preamble {
-    id: 302050110
-    name: "filtering.fwd_classifier_counter"
-    alias: "fwd_classifier_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33596298
-}
-direct_counters {
-  preamble {
-    id: 301993073
-    name: "forwarding.bridging_counter"
-    alias: "bridging_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33596749
-}
-direct_counters {
-  preamble {
-    id: 302053291
-    name: "forwarding.mpls_counter"
-    alias: "mpls_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33574274
-}
-direct_counters {
-  preamble {
-    id: 301991276
-    name: "forwarding.unicast_v4_counter"
-    alias: "unicast_v4_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33586372
-}
-direct_counters {
-  preamble {
-    id: 301995056
-    name: "forwarding.acl_counter"
-    alias: "acl_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33574876
-}
-direct_counters {
-  preamble {
-    id: 301991880
-    name: "next.simple_counter"
-    alias: "simple_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33571723
-}
-direct_counters {
-  preamble {
-    id: 302023316
-    name: "next.hashed_counter"
-    alias: "hashed_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33608588
-}
-controller_packet_metadata {
-  preamble {
-    id: 2868941301
-    name: "packet_in"
-    annotations: "@controller_header(\"packet_in\")"
-  }
-  metadata {
-    id: 1
-    name: "ingress_port"
-    bitwidth: 9
-  }
-  metadata {
-    id: 2
-    name: "_pad"
-    bitwidth: 7
-  }
-}
-controller_packet_metadata {
-  preamble {
-    id: 2868916615
-    name: "packet_out"
-    annotations: "@not_extracted_in_egress()"
-    annotations: "@controller_header(\"packet_out\")"
-  }
-  metadata {
-    id: 1
-    name: "egress_port"
-    bitwidth: 9
-  }
-  metadata {
-    id: 2
-    name: "_pad"
-    bitwidth: 7
-  }
-}
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/tofino.bin
deleted file mode 100644
index a2cdd3c..0000000
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric-spgw-int/montara/tofino.bin
+++ /dev/null
Binary files differ
diff --git a/pipelines/fabric/src/main/resources/fabric.p4 b/pipelines/fabric/src/main/resources/fabric.p4
index 610975c..cb287a3 100644
--- a/pipelines/fabric/src/main/resources/fabric.p4
+++ b/pipelines/fabric/src/main/resources/fabric.p4
@@ -46,6 +46,8 @@
     EgressNextControl() egress_next;
 
     apply {
+        fabric_metadata.int_metadata.ingress_tstamp =
+            (bit<32>) standard_metadata.ingress_global_timestamp;
         packet_io_ingress.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
 #ifdef WITH_SPGW_PCC_GATING
diff --git a/pipelines/fabric/src/main/resources/include/header.p4 b/pipelines/fabric/src/main/resources/include/header.p4
index 2ffaf1b..7adc246 100644
--- a/pipelines/fabric/src/main/resources/include/header.p4
+++ b/pipelines/fabric/src/main/resources/include/header.p4
@@ -215,6 +215,7 @@
     bit<8> int_hdr_word_len;
     bit<32> switch_id;
     bit<5> ins_cnt_tmp;
+    bit<32> ingress_tstamp;
 }
 
 #endif // WITH_INT_TRANSIT
diff --git a/pipelines/fabric/src/main/resources/include/int_transit.p4 b/pipelines/fabric/src/main/resources/include/int_transit.p4
index d09eab8..7ab8363 100644
--- a/pipelines/fabric/src/main/resources/include/int_transit.p4
+++ b/pipelines/fabric/src/main/resources/include/int_transit.p4
@@ -28,8 +28,8 @@
 
     action int_set_header_4() {
         hdr.int_ingress_tstamp.setValid();
-        hdr.int_ingress_tstamp.ingress_tstamp =
-            (bit<32>) standard_metadata.ingress_global_timestamp;
+        hdr.int_ingress_tstamp.ingress_tstamp = int_metadata.ingress_tstamp;
+            // (bit<32>) standard_metadata.ingress_global_timestamp;
     }
 
     action int_set_header_5() {
@@ -232,8 +232,10 @@
     }
 
     apply {
-        int_inst_0003.apply();
-        int_inst_0407.apply();
+        int_set_header_0003_i13();
+        // int_inst_0003.apply();
+        int_set_header_0407_i12();
+        // int_inst_0407.apply();
     }
 }
 
@@ -266,15 +268,15 @@
 control int_egress(inout parsed_headers_t hdr,
                    inout int_metadata_t int_metadata,
                    inout standard_metadata_t standard_metadata) {
-    action int_transit(bit<32> switch_id) {
-        int_metadata.switch_id = switch_id;
+    action int_transit() {
+        int_metadata.switch_id = INT_SWITCH_ID;
         int_metadata.insert_byte_cnt = (bit<16>) (hdr.int_header.ins_cnt << 2);
         int_metadata.int_hdr_word_len = (bit<8>) int_metadata.ins_cnt_tmp;
     }
-    table int_prep {
-        key = {}
-        actions = {int_transit;}
-    }
+//    table int_prep {
+//        key = {}
+//        actions = {int_transit;}
+//    }
 
     action int_hop_cnt_increment() {
         hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1;
@@ -288,7 +290,8 @@
             if(hdr.int_header.total_hop_cnt != hdr.int_header.max_hop_cnt &&
                hdr.int_header.e == 0) {
                 int_hop_cnt_increment();
-                int_prep.apply();
+                int_transit();
+                // int_prep.apply();
                 int_metadata_insert.apply(hdr, int_metadata, standard_metadata);
                 int_outer_encap.apply(hdr, int_metadata);
             } else {
diff --git a/pipelines/fabric/src/test/p4/fabric-spgw/fabric-spgw-mpls-int-dl.protobuf.txt b/pipelines/fabric/src/test/p4/fabric-spgw/fabric-spgw-mpls-int-dl.protobuf.txt
new file mode 100644
index 0000000..e80eb0e
--- /dev/null
+++ b/pipelines/fabric/src/test/p4/fabric-spgw/fabric-spgw-mpls-int-dl.protobuf.txt
@@ -0,0 +1,311 @@
+table_entry {
+  table_id: 33611649
+  match {
+    field_id: 3
+    ternary {
+      value: "\000\000"
+      mask: "\000\000"
+    }
+  }
+  match {
+    field_id: 2
+    exact {
+      value: "\000"
+    }
+  }
+  match {
+    field_id: 1
+    exact {
+      value: "\000\001"
+    }
+  }
+  action {
+    action {
+      action_id: 16835546
+      params {
+        param_id: 1
+        value: "\017\376"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33596298
+  match {
+    field_id: 2
+    exact {
+      value: "\302BY-:\204"
+    }
+  }
+  match {
+    field_id: 1
+    exact {
+      value: "\000\001"
+    }
+  }
+  match {
+    field_id: 3
+    exact {
+      value: "\010\000"
+    }
+  }
+  action {
+    action {
+      action_id: 16840921
+      params {
+        param_id: 1
+        value: "\002"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33586372
+  match {
+    field_id: 1
+    lpm {
+      value: "\300\250g\013"
+      prefix_len: 32
+    }
+  }
+  action {
+    action {
+      action_id: 16839692
+      params {
+        param_id: 1
+        value: "\000\000\000\001"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33571723
+  match {
+    field_id: 1
+    exact {
+      value: "\000\000\000\001"
+    }
+  }
+  action {
+    action {
+      action_id: 16812135
+      params {
+        param_id: 2
+        value: ":\301\342S\341P"
+      }
+      params {
+        param_id: 3
+        value: "RT\000)\311\267"
+      }
+      params {
+        param_id: 1
+        value: "\000\002"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33611649
+  match {
+    field_id: 3
+    ternary {
+      value: "\000\000"
+      mask: "\000\000"
+    }
+  }
+  match {
+    field_id: 2
+    exact {
+      value: "\000"
+    }
+  }
+  match {
+    field_id: 1
+    exact {
+      value: "\000\002"
+    }
+  }
+  action {
+    action {
+      action_id: 16835546
+      params {
+        param_id: 1
+        value: "\000\024"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33596298
+  match {
+    field_id: 2
+    exact {
+      value: ":\301\342S\341P"
+    }
+  }
+  match {
+    field_id: 1
+    exact {
+      value: "\000\002"
+    }
+  }
+  match {
+    field_id: 3
+    exact {
+      value: "\010\000"
+    }
+  }
+  action {
+    action {
+      action_id: 16840921
+      params {
+        param_id: 1
+        value: "\002"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33586372
+  match {
+    field_id: 1
+    lpm {
+      value: "\020\377\377\374"
+      prefix_len: 32
+    }
+  }
+  action {
+    action {
+      action_id: 16839692
+      params {
+        param_id: 1
+        value: "\000\000\000\002"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33571723
+  match {
+    field_id: 1
+    exact {
+      value: "\000\000\000\002"
+    }
+  }
+  action {
+    action {
+      action_id: 16780811
+      params {
+        param_id: 2
+        value: "\302BY-:\204"
+      }
+      params {
+        param_id: 3
+        value: "RT\000\005{Y"
+      }
+      params {
+        param_id: 1
+        value: "\000\001"
+      }
+      params {
+        param_id: 4
+        value: "\000\000\314"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33618733
+  match {
+    field_id: 1
+    lpm {
+      value: "\020\377\377\374"
+      prefix_len: 32
+    }
+  }
+  action {
+    action {
+      action_id: 16800567
+    }
+  }
+}
+table_entry {
+  table_id: 33615906
+  match {
+    field_id: 1
+    exact {
+      value: "\300\250f\r"
+    }
+  }
+  action {
+    action {
+      action_id: 16800567
+    }
+  }
+}
+table_entry {
+  table_id: 33582731
+  match {
+    field_id: 1
+    exact {
+      value: "\020\377\377\374"
+    }
+  }
+  action {
+    action {
+      action_id: 16804065
+      params {
+        param_id: 2
+        value: "\300\250f\013"
+      }
+      params {
+        param_id: 3
+        value: "\300\250f\r"
+      }
+      params {
+        param_id: 1
+        value: "\000\000\000\001"
+      }
+    }
+  }
+}
+table_entry {
+  table_id: 33583029
+  match {
+    field_id: 1
+    exact {
+      value: "\r"
+    }
+  }
+  action {
+    action {
+      action_id: 16810248
+    }
+  }
+}
+table_entry {
+  table_id: 33570208
+  match {
+    field_id: 1
+    exact {
+      value: "\014"
+    }
+  }
+  action {
+    action {
+      action_id: 16809122
+    }
+  }
+}
+table_entry {
+  table_id: 33604372
+  action {
+    action {
+      action_id: 16841868
+      params {
+        param_id: 1
+        value: "\000\000\000\001"
+      }
+    }
+  }
+}